summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature-multiple-ldap-servers' into 'master'Dmitriy Zaporozhets2014-10-146-14/+18
|\
| * Use Hash syntax for LDAP server declarationJan-Willem van der Meer2014-10-142-4/+4
| * Move dynamic omniauth declarations to initializerJan-Willem van der Meer2014-10-141-4/+0
| * Merge remote-tracking branch 'origin/master' into feature-multiple-ldap-serversJan-Willem van der Meer2014-10-134-11/+42
| |\
| * | Add refactoring for multiple LDAP server supportJan-Willem van der Meer2014-10-136-33/+36
| * | Merge pull request #8020 from mr-vinn/note-trunc-linkDmitriy Zaporozhets2014-10-132-9/+58
| |\ \
* | | | Different wording for notification note.Marin Jankovski2014-10-141-3/+3
* | | | Add a note about notification for a project.Marin Jankovski2014-10-141-4/+8
* | | | Merge pull request #7942 from cirosantilli/commit-changes-uppercaseDmitriy Zaporozhets2014-10-133-18/+17
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make new and edit file submit more uniformCiro Santilli2014-10-083-18/+17
* | | | Merge branch 'sorting-users-in-admin' into 'master'Dmitriy Zaporozhets2014-10-134-11/+42
|\ \ \ \
| * | | | Admin: user sortingValery Sizov2014-10-134-11/+42
* | | | | Merge branch 'feature-oauth-refactoring' into 'master'Dmitriy Zaporozhets2014-10-131-20/+15
|\ \ \ \ \
| * | | | | Refactor OAuth refactorings to CEJan-Willem van der Meer2014-10-101-20/+15
| |/ / / /
* | | | | Merge pull request #8020 from mr-vinn/note-trunc-linkDmitriy Zaporozhets2014-10-132-9/+58
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | Improve dashboard note view and add testsVinnie Okada2014-10-122-11/+26
| * | | Preserve link href in truncated note viewVinnie Okada2014-10-122-7/+41
* | | | Merge branch 'ambiguous-sha' into 'master'fondevDmitriy Zaporozhets2014-10-1215-15/+37
|\ \ \ \ | |/ / / |/| | |
| * | | Dontr decoarate already decorated stuffDmitriy Zaporozhets2014-10-101-1/+7
| * | | Use 8chars short sha for commit in viewsDmitriy Zaporozhets2014-10-104-4/+10
| * | | Dont raise exception when wrong commit id passedDmitriy Zaporozhets2014-10-101-0/+2
| * | | Use full commit sha width for reference in note body to prevent Ambiguous SHA...Dmitriy Zaporozhets2014-10-101-1/+1
| * | | Use short_id instead of [0..N] for short version of commit shaDmitriy Zaporozhets2014-10-1011-11/+19
| |/ /
* | | Merge pull request #7915 from bbodenmiller/patch-12Sytse Sijbrandij2014-10-121-3/+3
|\ \ \ | |/ / |/| |
| * | improve wording on protected branches pageBen Bodenmiller2014-10-121-3/+3
* | | Remove unused methodVinnie Okada2014-10-091-7/+0
* | | annotateValery Sizov2014-10-0918-129/+175
* | | Snippets: public/internal/privateValery Sizov2014-10-0911-48/+164
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-081-1/+2
|\ \ \
| * \ \ Merge pull request #7986 from liammonahan/masterDmitriy Zaporozhets2014-10-081-1/+2
| |\ \ \
| | * | | Correctly pluralize participants on issue show page.Liam Monahan2014-10-081-1/+2
| | | |/ | | |/|
* | | | Remove border radius because it has wrong backgroundDmitriy Zaporozhets2014-10-081-2/+0
|/ / /
* | | Merge branch 'improve-danger-zone' into 'master'Dmitriy Zaporozhets2014-10-0810-111/+150
|\ \ \
| * | | Restyle colorful panel boxesDmitriy Zaporozhets2014-10-086-40/+33
| * | | Apply ConfirmDangerModal for project transfer/remove actionsDmitriy Zaporozhets2014-10-083-7/+22
| * | | ConfirmDangerModal window added. It will be used for confirmation of dangerou...Dmitriy Zaporozhets2014-10-082-0/+42
| * | | show danger settings by defaultDmitriy Zaporozhets2014-10-081-86/+75
* | | | Merge pull request #7545 from buildbox/buildbox-serviceDmitriy Zaporozhets2014-10-083-6/+131
|\ \ \ \ | |/ / / |/| | |
| * | | Handle the case where the CI service may not provide a status_img_path method.Keith Pitt2014-10-081-2/+7
| * | | Merge branch 'master' into buildbox-serviceKeith Pitt2014-10-08189-483/+882
| |\ \ \
| * | | | Added support for BuildboxKeith Pitt2014-10-083-7/+128
* | | | | Merge pull request #7983 from cirosantilli/factor-issue-mr-serviceDmitriy Zaporozhets2014-10-083-20/+15
|\ \ \ \ \
| * | | | | Factor issue and merge request servicesCiro Santilli2014-10-073-20/+15
* | | | | | Merge pull request #7938 from cirosantilli/factor-dashboard-helperDmitriy Zaporozhets2014-10-081-21/+12
|\ \ \ \ \ \
| * | | | | | Factor dashboard helper methods.Ciro Santilli2014-10-021-21/+12
* | | | | | | Merge pull request #7979 from mr-vinn/refactor-tasksDmitriy Zaporozhets2014-10-083-41/+34
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Rename coffeescript fileVinnie Okada2014-10-071-0/+0
| * | | | | | Refactor task list tests and coffeescriptVinnie Okada2014-10-063-41/+34
* | | | | | | Merge pull request #7981 from cirosantilli/www-to-aboutSytse Sijbrandij2014-10-083-4/+12
|\ \ \ \ \ \ \
| * | | | | | | Replace www.gitlab.com with about.gitlab.comCiro Santilli2014-10-073-4/+12
View Lorry Controller Status