OSDN Git Service

wvm/gitlab.git
12 years agoUse the omniauth-ldap info object instead of the raw ldap info in extra.
Steve Prentice [Fri, 17 Feb 2012 17:10:50 +0000 (09:10 -0800)]
Use the omniauth-ldap info object instead of the raw ldap info in extra.

This helps with compatibility with more LDAP providers as the implementation
doesn't depend on the exact names of the LDAP fields. The LDAP strategy
helps maps the attributes to the fields in the info object and we use the
info object to get the email and name.

This makes the LDAP auth compatible with most OpenLDAP servers as well.

12 years agoFixed mistype in permissions, Fixed migration
Dmitriy Zaporozhets [Thu, 16 Feb 2012 07:04:56 +0000 (09:04 +0200)]
Fixed mistype in permissions, Fixed migration

12 years agoFixed permission migration
Dmitriy Zaporozhets [Thu, 16 Feb 2012 07:04:55 +0000 (09:04 +0200)]
Fixed permission migration

12 years ago4 roles permission system
Dmitriy Zaporozhets [Thu, 16 Feb 2012 07:03:55 +0000 (09:03 +0200)]
4 roles permission system

12 years agoUpdated readme, Roles in progress
Dmitriy Zaporozhets [Wed, 15 Feb 2012 21:51:04 +0000 (23:51 +0200)]
Updated readme, Roles in progress

12 years agoProtectedBranches model, Master permission for repo\n Allow push to protected branch...
Dmitriy Zaporozhets [Wed, 15 Feb 2012 20:02:33 +0000 (22:02 +0200)]
ProtectedBranches model, Master permission for repo\n Allow push to protected branch for masters only

12 years agoShow current commit id in branch/tag select
Dmitriy Zaporozhets [Wed, 15 Feb 2012 06:46:09 +0000 (08:46 +0200)]
Show current commit id in branch/tag select

12 years agoMerge branch 'master' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Tue, 14 Feb 2012 23:15:08 +0000 (01:15 +0200)]
Merge branch 'master' of dev.gitlabhq.com:gitlabhq

12 years agoShow commits for merge request immediatly
Dmitriy Zaporozhets [Tue, 14 Feb 2012 23:15:02 +0000 (01:15 +0200)]
Show commits for merge request immediatly

12 years agoBug#326: Always empty repositories if trailing slash is missed in base_path
Valery Sizov [Tue, 14 Feb 2012 22:42:46 +0000 (00:42 +0200)]
Bug#326: Always empty repositories if trailing slash is missed in base_path

12 years agoFixed encoding issue for diff. Reordered merge request commits
Dmitriy Zaporozhets [Tue, 14 Feb 2012 22:41:36 +0000 (00:41 +0200)]
Fixed encoding issue for diff. Reordered merge request commits

12 years agofixed design new issue form
Valery Sizov [Tue, 14 Feb 2012 22:33:26 +0000 (00:33 +0200)]
fixed design new issue form

12 years agoMerge branch 'master' of dev.gitlabhq.com:gitlabhq
Dmitriy Zaporozhets [Tue, 14 Feb 2012 22:21:07 +0000 (00:21 +0200)]
Merge branch 'master' of dev.gitlabhq.com:gitlabhq

12 years agoCommit show should display author & commiter info
Dmitriy Zaporozhets [Tue, 14 Feb 2012 22:21:00 +0000 (00:21 +0200)]
Commit show should display author & commiter info

12 years agofixed design login form
Valery Sizov [Tue, 14 Feb 2012 22:15:15 +0000 (00:15 +0200)]
fixed design login form

12 years agobetter commits list style
Dmitriy Zaporozhets [Tue, 14 Feb 2012 22:10:01 +0000 (00:10 +0200)]
better commits list style

12 years agoIgnore invalid submodule entries
Dmitriy Zaporozhets [Tue, 14 Feb 2012 21:53:41 +0000 (23:53 +0200)]
Ignore invalid submodule entries

12 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Tue, 14 Feb 2012 21:49:19 +0000 (23:49 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

12 years agosubmodules displayed for tree view
Dmitriy Zaporozhets [Tue, 14 Feb 2012 21:48:42 +0000 (23:48 +0200)]
submodules displayed for tree view

12 years agoMerge pull request #406 from pdfr/syntax
Dmitriy Zaporozhets [Tue, 14 Feb 2012 20:52:28 +0000 (12:52 -0800)]
Merge pull request #406 from pdfr/syntax

Add syntax highlighting for D and Haskell

12 years agoAdd syntax highlighting for D and Haskell
Pedro Rodrigues [Tue, 14 Feb 2012 20:46:56 +0000 (20:46 +0000)]
Add syntax highlighting for D and Haskell

12 years agoFixed commit diff: content of removed files displayed
Dmitriy Zaporozhets [Tue, 14 Feb 2012 18:00:25 +0000 (20:00 +0200)]
Fixed commit diff: content of removed files displayed

12 years agoper line comments improved. replaced from dbclick to link
Dmitriy Zaporozhets [Mon, 13 Feb 2012 22:20:23 +0000 (00:20 +0200)]
per line comments improved. replaced from dbclick to link

12 years agoMerge branch 'features/pry'
Dmitriy Zaporozhets [Mon, 13 Feb 2012 19:33:18 +0000 (21:33 +0200)]
Merge branch 'features/pry'

12 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
Dmitriy Zaporozhets [Mon, 13 Feb 2012 18:42:19 +0000 (20:42 +0200)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

12 years agoFixed a typo by the third n in 'commit'.
root [Sun, 12 Feb 2012 23:49:38 +0000 (17:49 -0600)]
Fixed a typo by the third n in 'commit'.

12 years agoenable markdown for email notification
Dmitriy Zaporozhets [Mon, 13 Feb 2012 18:40:39 +0000 (20:40 +0200)]
enable markdown for email notification

12 years agoadd vagrant file to ignore list
Saito [Mon, 13 Feb 2012 08:39:35 +0000 (16:39 +0800)]
add vagrant file to ignore list

12 years agoMerge pull request #399 from JoshuaRogers/corrected_typo
Ariejan de Vroom [Mon, 13 Feb 2012 07:31:05 +0000 (23:31 -0800)]
Merge pull request #399 from JoshuaRogers/corrected_typo

Fixed a typo by the third n in 'commit'.

12 years agoswitch ruby-debug to pry
Saito [Mon, 13 Feb 2012 05:43:58 +0000 (13:43 +0800)]
switch ruby-debug to pry

12 years agoFixed a typo by the third n in 'commit'.
root [Sun, 12 Feb 2012 23:49:38 +0000 (17:49 -0600)]
Fixed a typo by the third n in 'commit'.

12 years agoCommits page styled better now
Dmitriy Zaporozhets [Sun, 12 Feb 2012 22:12:18 +0000 (00:12 +0200)]
Commits page styled better now

12 years agofixed unworking infinite scroll
Dmitriy Zaporozhets [Sun, 12 Feb 2012 21:52:27 +0000 (23:52 +0200)]
fixed unworking infinite scroll

12 years agofixed flash message. better tree css
Dmitriy Zaporozhets [Sun, 12 Feb 2012 17:47:37 +0000 (19:47 +0200)]
fixed flash message. better tree css

12 years agofixed layout for ipad. changed main width
Dmitriy Zaporozhets [Sun, 12 Feb 2012 15:48:17 +0000 (17:48 +0200)]
fixed layout for ipad. changed main width

12 years agofixed main menu for firefox & opera
Dmitriy Zaporozhets [Sun, 12 Feb 2012 15:34:52 +0000 (17:34 +0200)]
fixed main menu for firefox & opera

12 years agostyled top panel
Dmitriy Zaporozhets [Sun, 12 Feb 2012 11:15:41 +0000 (13:15 +0200)]
styled top panel

12 years agorestyled main menu. move from left to top orientation
Dmitriy Zaporozhets [Sun, 12 Feb 2012 00:38:38 +0000 (02:38 +0200)]
restyled main menu. move from left to top orientation

12 years agoimproved diff, restyled login page
Dmitriy Zaporozhets [Sat, 11 Feb 2012 22:29:16 +0000 (00:29 +0200)]
improved diff, restyled login page

12 years agoLists restyled, blue link colors added
Dmitriy Zaporozhets [Sat, 11 Feb 2012 21:22:33 +0000 (23:22 +0200)]
Lists restyled, blue link colors added

12 years agoMoving to rails 3.2
Dmitriy Zaporozhets [Sat, 11 Feb 2012 18:34:25 +0000 (20:34 +0200)]
Moving to rails 3.2

12 years agoAdmin area improved
Dmitriy Zaporozhets [Sat, 11 Feb 2012 17:56:18 +0000 (19:56 +0200)]
Admin area improved

12 years agoImproved commit author notification
Dmitriy Zaporozhets [Fri, 10 Feb 2012 02:59:39 +0000 (10:59 +0800)]
Improved commit author notification

12 years agoMerge branch 'issue-331'
Saito [Fri, 10 Feb 2012 02:59:32 +0000 (10:59 +0800)]
Merge branch 'issue-331'

12 years agologo updated
Dmitriy Zaporozhets [Thu, 9 Feb 2012 22:07:49 +0000 (00:07 +0200)]
logo updated

12 years agoTitled dashboard, admin, profile areas. Wider top panel. Restored search input
Dmitriy Zaporozhets [Thu, 9 Feb 2012 07:59:14 +0000 (09:59 +0200)]
Titled dashboard, admin, profile areas. Wider top panel. Restored search input

12 years agolayout refactored
Dmitriy Zaporozhets [Thu, 9 Feb 2012 07:59:04 +0000 (09:59 +0200)]
layout refactored

12 years agoBrowse button in commit list
Dmitriy Zaporozhets [Thu, 9 Feb 2012 07:51:50 +0000 (09:51 +0200)]
Browse button in commit list

12 years agofix test crash after rename link
Dmitriy Zaporozhets [Wed, 8 Feb 2012 18:26:31 +0000 (20:26 +0200)]
fix test crash after rename link

12 years agoremoved dots from menu, renamed Code to Files
Dmitriy Zaporozhets [Wed, 8 Feb 2012 17:18:38 +0000 (19:18 +0200)]
removed dots from menu, renamed Code to Files

12 years agoSnippets - fixed after bootstrap
Dmitriy Zaporozhets [Tue, 7 Feb 2012 23:00:49 +0000 (01:00 +0200)]
Snippets - fixed after bootstrap
Project - restyled show page, removed info page
Repository - restyled show page, added download option
Tags - added download options

12 years agoFix encoding issues for compare view
Dmitriy Zaporozhets [Tue, 7 Feb 2012 17:21:16 +0000 (19:21 +0200)]
Fix encoding issues for compare view

12 years agoCompare view for commits
Dmitriy Zaporozhets [Mon, 6 Feb 2012 20:32:04 +0000 (22:32 +0200)]
Compare view for commits

12 years agoIssues, MR, Wall can be enabled/disabled per project
Dmitriy Zaporozhets [Mon, 6 Feb 2012 17:40:32 +0000 (19:40 +0200)]
Issues, MR, Wall can be enabled/disabled per project

12 years agoper-line comments css fixes
Dmitriy Zaporozhets [Mon, 6 Feb 2012 00:15:45 +0000 (02:15 +0200)]
per-line comments css fixes

12 years agofixed ability to edit team member access
Dmitriy Zaporozhets [Sun, 5 Feb 2012 23:56:26 +0000 (01:56 +0200)]
fixed ability to edit team member access

12 years agoproject membership widget. css fixes
Dmitriy Zaporozhets [Sun, 5 Feb 2012 19:26:04 +0000 (21:26 +0200)]
project membership widget. css fixes

12 years agoMenlo font added to fix code preview for osx
Dmitriy Zaporozhets [Sun, 5 Feb 2012 17:12:14 +0000 (19:12 +0200)]
Menlo font added to fix code preview for osx

12 years agofix empty page after broken pull request
Dmitriy Zaporozhets [Sun, 5 Feb 2012 17:01:13 +0000 (19:01 +0200)]
fix empty page after broken pull request

12 years agoMerge pull request #292 from si14/patch-1
Dmitriy Zaporozhets [Sun, 5 Feb 2012 16:35:41 +0000 (08:35 -0800)]
Merge pull request #292 from si14/patch-1

line numbers are now non-selectable

12 years agoMerge pull request #363 from druidvav/master
Dmitriy Zaporozhets [Sun, 5 Feb 2012 16:30:12 +0000 (08:30 -0800)]
Merge pull request #363 from druidvav/master

Lexer корёжит имена пользователей на русском языке

12 years agocss fixes for .entry class
Dmitriy Zaporozhets [Sun, 5 Feb 2012 11:51:51 +0000 (13:51 +0200)]
css fixes for .entry class

12 years agofixed issue, mr crash if assignee/author removed from team
Dmitriy Zaporozhets [Sun, 5 Feb 2012 10:58:02 +0000 (12:58 +0200)]
fixed issue, mr crash if assignee/author removed from team

12 years agofix 500 on project page after someone leave note on wall
Dmitriy Zaporozhets [Sun, 5 Feb 2012 10:26:27 +0000 (12:26 +0200)]
fix 500 on project page after someone leave note on wall

12 years agofixed branch switch for code view
Dmitriy Zaporozhets [Sun, 5 Feb 2012 10:23:14 +0000 (12:23 +0200)]
fixed branch switch for code view

12 years agoFix for utf-8 names in empty project page.
druidvav [Wed, 1 Feb 2012 10:42:42 +0000 (14:42 +0400)]
Fix for utf-8 names in empty project page.

12 years agoMerge branch 'bootstrap'
Dmitriy Zaporozhets [Sun, 29 Jan 2012 22:45:35 +0000 (00:45 +0200)]
Merge branch 'bootstrap'

Conflicts:
Gemfile
app/views/commits/_commits.html.haml
app/views/projects/empty.html.haml

12 years agoBootstrap: test fixes
Dmitriy Zaporozhets [Sun, 29 Jan 2012 22:43:14 +0000 (00:43 +0200)]
Bootstrap: test fixes

12 years agoBootstrap: Issues, Merge Requests, SSH Key completed
Dmitriy Zaporozhets [Sun, 29 Jan 2012 21:59:12 +0000 (23:59 +0200)]
Bootstrap: Issues, Merge Requests, SSH Key completed

12 years agoBootstrap: Commits page
Dmitriy Zaporozhets [Sun, 29 Jan 2012 19:58:31 +0000 (21:58 +0200)]
Bootstrap: Commits page

12 years agoAjax branch/tag switch for tree view
Dmitriy Zaporozhets [Sun, 29 Jan 2012 19:30:03 +0000 (21:30 +0200)]
Ajax branch/tag switch for tree view

12 years agofixed tree view
Dmitriy Zaporozhets [Sun, 29 Jan 2012 10:45:51 +0000 (12:45 +0200)]
fixed tree view

12 years agoBootstrap: Issues & MR
Dmitriy Zaporozhets [Sun, 29 Jan 2012 10:04:09 +0000 (12:04 +0200)]
Bootstrap: Issues & MR

12 years agoBootstrap: Merge Request -> Show
Dmitriy Zaporozhets [Sat, 28 Jan 2012 15:21:00 +0000 (17:21 +0200)]
Bootstrap: Merge Request -> Show

12 years agoBootstrap: Activities
Dmitriy Zaporozhets [Sat, 28 Jan 2012 14:47:55 +0000 (16:47 +0200)]
Bootstrap: Activities

12 years agoMerge branch 'master' of github.com:gitlabhq/gitlabhq
vsizov [Sat, 28 Jan 2012 13:42:14 +0000 (16:42 +0300)]
Merge branch 'master' of github.com:gitlabhq/gitlabhq

12 years agoLDAP done
vsizov [Sat, 28 Jan 2012 13:23:17 +0000 (16:23 +0300)]
LDAP done

12 years agoBootstrap: Deploy keys, Hooks
Dmitriy Zaporozhets [Sat, 28 Jan 2012 10:40:17 +0000 (12:40 +0200)]
Bootstrap: Deploy keys, Hooks

12 years agodelete unnecessary files
Valery Sizov [Sat, 21 Jan 2012 18:44:41 +0000 (20:44 +0200)]
delete unnecessary files

12 years agoLDAP BASE IMPLEMENRTATION
Valery Sizov [Sat, 21 Jan 2012 18:36:14 +0000 (20:36 +0200)]
LDAP BASE IMPLEMENRTATION

12 years agoBootstrap: network graph
Dmitriy Zaporozhets [Sat, 28 Jan 2012 10:02:03 +0000 (12:02 +0200)]
Bootstrap: network graph

12 years agoBootstrap: team
Dmitriy Zaporozhets [Sat, 28 Jan 2012 09:54:11 +0000 (11:54 +0200)]
Bootstrap: team

12 years agoBootstrap: cleaning commits css
Dmitriy Zaporozhets [Sat, 28 Jan 2012 00:08:26 +0000 (02:08 +0200)]
Bootstrap: cleaning commits css

12 years agoBootstrap: Issues restyled
Dmitriy Zaporozhets [Fri, 27 Jan 2012 23:49:14 +0000 (01:49 +0200)]
Bootstrap: Issues restyled

12 years agoBootstrap: application layout
Dmitriy Zaporozhets [Fri, 27 Jan 2012 22:51:02 +0000 (00:51 +0200)]
Bootstrap: application layout

12 years agoMerge pull request #283 from veprbl/master
Dmitriy Zaporozhets [Fri, 27 Jan 2012 19:15:24 +0000 (11:15 -0800)]
Merge pull request #283 from veprbl/master

Display both author and committer in commits list

12 years agoMerge pull request #337 from tomneedham/patch-1
Dmitriy Zaporozhets [Fri, 27 Jan 2012 19:15:07 +0000 (11:15 -0800)]
Merge pull request #337 from tomneedham/patch-1

fixed no ssh key message

12 years agoBootstrap: login screen
Dmitriy Zaporozhets [Fri, 27 Jan 2012 17:58:10 +0000 (19:58 +0200)]
Bootstrap: login screen

12 years agoBootstrap: btn replacing
Dmitriy Zaporozhets [Fri, 27 Jan 2012 07:19:55 +0000 (09:19 +0200)]
Bootstrap: btn replacing

12 years agoBootstrap: issues, notes css
Dmitriy Zaporozhets [Fri, 27 Jan 2012 06:57:55 +0000 (08:57 +0200)]
Bootstrap: issues, notes css

12 years agoBootstrap: commits page + tree
Dmitriy Zaporozhets [Thu, 26 Jan 2012 23:46:32 +0000 (01:46 +0200)]
Bootstrap: commits page + tree

12 years agoproject, commits page with bootstrap
Dmitriy Zaporozhets [Thu, 26 Jan 2012 22:13:19 +0000 (00:13 +0200)]
project, commits page with bootstrap

12 years agofixed no ssh key message
tomneedham [Thu, 26 Jan 2012 19:02:59 +0000 (19:02 +0000)]
fixed no ssh key message

12 years agoCleaning css. layout is broken
Dmitriy Zaporozhets [Thu, 26 Jan 2012 17:25:35 +0000 (19:25 +0200)]
Cleaning css. layout is broken

12 years agoboostrap scss gem
Dmitriy Zaporozhets [Thu, 26 Jan 2012 07:51:11 +0000 (09:51 +0200)]
boostrap scss gem

12 years agocss refactoring & utf8 meta tag
Dmitriy Zaporozhets [Thu, 26 Jan 2012 07:50:11 +0000 (09:50 +0200)]
css refactoring & utf8 meta tag

12 years agoCommit diff fixes, per-line comments fixed
Dmitriy Zaporozhets [Wed, 25 Jan 2012 19:10:09 +0000 (21:10 +0200)]
Commit diff fixes, per-line comments fixed

12 years agotags css refactored
Dmitriy Zaporozhets [Wed, 25 Jan 2012 07:16:08 +0000 (09:16 +0200)]
tags css refactored

12 years agofixes raw view for text files with code like *.rb
Dmitriy Zaporozhets [Wed, 25 Jan 2012 07:15:08 +0000 (09:15 +0200)]
fixes raw view for text files with code like *.rb

12 years agofixed double form 'Add new' for issues
Dmitriy Zaporozhets [Wed, 25 Jan 2012 07:13:08 +0000 (09:13 +0200)]
fixed double form 'Add new' for issues