summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Don't require Gitlab::Redis in mail_room.yml if it's already definedRémy Coutable2016-06-101-1/+1
* Merge branch 'fix-git-http-routing' into 'master' Douwe Maan2016-06-091-17/+17
|\
| * Ensure only IDs ending in .git perform git actionsfix-git-http-routingSean McGivern2016-06-091-17/+17
* | Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable2016-06-091-1/+1
|\ \ | |/ |/|
| * Hook up the updated `WikiLinkFilter` to the wiki controllers.Timothy Andrew2016-06-091-1/+1
* | Merge branch '13840-allow-clones-from-http-url-s-without-appending-git' into ...Robert Speicher2016-06-081-0/+17
|\ \
| * | Allow clones from /namespace/projectSean McGivern2016-06-081-0/+17
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-06-085-5/+203
|\ \ \ | |/ /
| * | Merge branch 'upgrade-nokogiri' into 'master' Robert Speicher2016-06-071-0/+6
| |\ \
| | * | Add LGPLv2 to license whiltelistStan Hu2016-06-071-0/+6
| * | | Merge branch '18082-instrument-repositorycheck-singlerepositoryworker-manuall...Yorick Peterse2016-06-071-0/+7
| |\ \ \ | | |/ / | |/| |
| | * | Instrument `RepositoryCheck::SingleRepositoryWorker` manuallyAlejandro Rodríguez2016-06-071-0/+7
| * | | Merge branch 'issue_14189' into 'master' Jacob Schatz2016-06-071-0/+2
| |\ \ \ | | |/ / | |/| |
| | * | Update method and routeAlfredo Sumaran2016-06-061-1/+1
| | * | Improve Issuable.order_labels_priorityRémy Coutable2016-06-062-16/+1
| | * | Sort by label priorityThijs Wouters2016-06-061-0/+15
| | * | Prioritize labels functionalityAlfredo Sumaran2016-06-061-0/+2
| * | | Resolve feedback.Connor Shea2016-06-062-2/+2
| * | | Add Licensing information and guidelines to the Documentation.Connor Shea2016-06-061-1/+1
| * | | Fix up all the decisions in the YML file.Connor Shea2016-06-061-115/+96
| * | | Add gems and licenses that were previously missing. Approve a number of licen...Connor Shea2016-06-061-8/+115
| * | | Add some gems' licenses not caught by License Finder.Connor Shea2016-06-062-0/+91
| |/ /
| * | Merge branch 'notes-are-awardables' into 'master' Douwe Maan2016-06-061-0/+1
| |\ \
| | * | Updated MR notes.notes-are-awardablesFatih Acet2016-06-061-0/+1
| * | | Implement U2F registration.Timothy Andrew2016-06-061-1/+2
| |/ /
| * | Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-037-8/+13
| |\ \ | | |/
| * | Incorportate feedbackZ.J. van de Weg2016-06-011-1/+0
| * | Merge branch 'master' into awardablesZJ van de Weg2016-05-305-2/+5
| |\ \
| * \ \ Merge branch 'master' into awardablesZJ van de Weg2016-05-253-6/+16
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-183-0/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-189-38/+68
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-114-61/+20
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-1112-32/+103
| |\ \ \ \ \ \ \
| * | | | | | | | Create table for award emojiZeger-Jan van de Weg2016-05-062-4/+7
* | | | | | | | | Rename finder to find_in_gitlab_or_ldapJacob Vosmaer2016-06-021-1/+1
* | | | | | | | | Merge branch 'master' into git-http-controllerJacob Vosmaer2016-06-0223-139/+223
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Attempt to fix the user page.Connor Shea2016-06-011-1/+2
| * | | | | | | | Remove d3 except for on pages where it's necessary.Connor Shea2016-06-011-0/+1
| * | | | | | | | Merge branch 'upgrade-devise-two-factor' into 'master' Robert Speicher2016-06-021-1/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Upgrade devise and devise-two-factor, remove devise-asyncConnor Shea2016-05-301-1/+0
| * | | | | | | | | Merge branch 'issue_15557' into 'master' Rémy Coutable2016-06-012-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Add leading comment space copissue_15557Felipe Artur2016-05-312-3/+3
| | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'rubocop/enable-space-before-comma-cop' into 'master' Robert Speicher2016-05-301-2/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Enable Style/SpaceBeforeComma rubocop coprubocop/enable-space-before-comma-copGrzegorz Bizon2016-05-301-2/+6
| | |/ / / / / / /
| * | | | | | | | Merge branch 'rubocop/enable-negatedif-style-cop' into 'master' Robert Speicher2016-05-301-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Enable Style/NegatedIf Rubocop coprubocop/enable-negatedif-style-copGrzegorz Bizon2016-05-301-1/+1
| | |/ / / / / / /
| * | | | | | | | Merge branch 'rubocop/enable-redundant-parentheses-cop' into 'master' Robert Speicher2016-05-301-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Enable Style/RedundantParentheses rubocop coprubocop/enable-redundant-parentheses-copGrzegorz Bizon2016-05-301-1/+1
| | |/ / / / / / /
| * | | | | | | | Enable Style/SpaceBeforeComment rubocop coprubocop/enable-space-before-comment-copGrzegorz Bizon2016-05-301-1/+1
| |/ / / / / / /
| * | | | | | | Merge branch 'move-project-dropdown-async' into 'master' Jacob Schatz2016-05-261-0/+1
| |\ \ \ \ \ \ \