summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove icons from group settings dropdownce-upstreamDmitriy Zaporozhets2016-05-121-3/+0
* Merge branch 'ce-upstream' of gitlab.com:gitlab-org/gitlab-ee into ce-upstreamDmitriy Zaporozhets2016-05-121-17/+16
|\
| * Comment out broken featuresYorick Peterse2016-05-121-17/+16
* | Fix group navigation after merge from CEDmitriy Zaporozhets2016-05-123-11/+12
|/
* Fix GeoGabriel Mazetto2016-05-122-1/+2
* fix MR templatesValery Sizov2016-05-121-0/+5
* Add app/workers/concerns to autoload pathsYorick Peterse2016-05-121-1/+4
* Use tr/casecmp to keep Rubocop happyYorick Peterse2016-05-123-5/+5
* Resolved conflict in EE downgrading guideYorick Peterse2016-05-121-23/+0
* Resolved conflict in empty project specYorick Peterse2016-05-121-3/+0
* Resolve conflict in group settings dropdownYorick Peterse2016-05-121-39/+16
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-upstreamYorick Peterse2016-05-111-3/+7
|\
| * Merge branch 'update-changelog-874' into 'master' Yorick Peterse2016-05-111-3/+7
| |\
| | * Updated 8.7.4 CHANGELOG entriesYorick Peterse2016-05-111-3/+7
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-upstreamValery Sizov2016-05-11320-3225/+2493
|\ \ \ | |/ /
| * | Merge branch 'casecmp-cop' into 'master' Rémy Coutable2016-05-114-6/+5
| |\ \
| | * | Enable Rubocop Casecmp Performance Cop.Connor Shea2016-05-104-6/+5
| * | | Merge branch 'string-replacement-cop' into 'master' Rémy Coutable2016-05-112-2/+3
| |\ \ \ | | |_|/ | |/| |
| | * | Enable the StringReplacement cop.Connor Shea2016-05-102-2/+3
| | |/
| * | Merge branch 'jquery-scrollto' into 'master' Jacob Schatz2016-05-113-4/+210
| |\ \
| | * | Removes jquery-scrollto-rails.Connor Shea2016-05-103-4/+210
| |/ /
| * | Merge branch 'fix-r-shortcut' into 'master' Jacob Schatz2016-05-101-0/+4
| |\ \
| | * | Restore "r" shortcutfix-r-shortcutAlfredo Sumaran2016-05-041-0/+4
| * | | Merge branch 'stanhu/gitlab-ce-add-eager-load-lib' into 'master' Robert Speicher2016-05-1011-191/+200
| |\ \ \
| | * | | Fix a few places where autoloading would failRémy Coutable2016-05-1011-190/+190
| | * | | Add eager load paths to help prevent dependency load issues with Sidekiq workersStan Hu2016-05-102-6/+15
| * | | | Merge branch 'issue_13987' into 'master' Stan Hu2016-05-103-3/+4
| |\ \ \ \
| | * | | | Update CHANGELOGAlfredo Sumaran2016-05-101-0/+1
| | * | | | Update Ace EditorAlfredo Sumaran2016-05-102-3/+3
| * | | | | Merge branch '15529-fix=missing-from-clause-for-table-issues' into 'master' Robert Speicher2016-05-103-2/+140
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix an issue when filtering merge requests with more than one labelRémy Coutable2016-05-103-2/+140
| * | | | | Merge branch 'issue_15673' into 'master' Jacob Schatz2016-05-101-1/+1
| |\ \ \ \ \
| | * | | | | Add to label :id to responseissue_15673Alfredo Sumaran2016-05-031-1/+1
| * | | | | | Merge branch 'fix/remove-broken-inline-runner-desc-edit' into 'master' Robert Speicher2016-05-102-38/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Use abbrevation in runners table in admin areaGrzegorz Bizon2016-05-101-1/+1
| | * | | | | Remove broken inline runner description edit formGrzegorz Bizon2016-05-092-38/+2
| * | | | | | Merge branch 'fix/using-uploads-in-global-snippets' into 'master' Robert Speicher2016-05-103-1/+26
| |\ \ \ \ \ \
| | * | | | | | Do not process upload links if no project contextGrzegorz Bizon2016-05-102-5/+9
| | * | | | | | Add Changelog entry for upload link in snippet fixGrzegorz Bizon2016-05-101-0/+1
| | * | | | | | Fix using link to uploads in global snippetsGrzegorz Bizon2016-05-102-1/+21
| | |/ / / / /
| * | | | | | Change dashboard button color to white on hoverDmitriy Zaporozhets2016-05-101-0/+4
| * | | | | | Minor consistency fixes to sidebar & headerDmitriy Zaporozhets2016-05-102-2/+2
| * | | | | | Merge branch 'mobile-navigation-redesign' into 'master' Dmitriy Zaporozhets2016-05-108-9/+108
| |\ \ \ \ \ \
| | * | | | | | Fix media queries for absolutely positioned nav elementAnnabel Dunstone2016-05-093-4/+14
| | * | | | | | Hide navbar on mobileAnnabel Dunstone2016-05-097-6/+95
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-05-10145-2734/+232
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '2460-3690-support-multiline-tag-message' into 'master' Rémy Coutable2016-05-109-142/+223
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Add integration specs for tagsRémy Coutable2016-05-108-137/+219
| | | * | | | | | Replace text field with textarea in 'New Tag' view and display tag message in...Calin Seciu2016-05-102-5/+4
| | * | | | | | | Merge branch 'revert-4026' into 'master' Rémy Coutable2016-05-105-7/+4
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |