summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Capitalize Gitdklischies/gitlab-ce-masterAchilleas Pipinellis2016-10-251-1/+1
* Add a note regarding syncing the git submodule conf to CI doc.Daniel Klischies2016-10-211-0/+6
* Merge branch 'separate-sidekiq-queues' into 'master' Douwe Maan2016-10-2162-68/+425
|\
| * Re-organize queues to use for Sidekiqseparate-sidekiq-queuesYorick Peterse2016-10-2162-68/+425
* | Merge branch 'patch-6' into 'master' Rémy Coutable2016-10-211-3/+3
|\ \
| * | Grammar fixes in docsWilfred Hughes2016-10-031-3/+3
* | | Merge branch 'patch-6' into 'master' Rémy Coutable2016-10-211-1/+1
|\ \ \
| * | | Changed gitlab-shell version to avoid warning when precompiling the assets.Ismael Arenzana2016-10-071-1/+1
* | | | Merge branch 'fix-bulk-assign-issues-for-external-issues' into 'master' Sean McGivern2016-10-212-1/+13
|\ \ \ \
| * | | | Ignore external issues when bulk assigning issues to author of merge request.fix-bulk-assign-issues-for-external-issuesAdam Niedzielski2016-10-202-1/+13
* | | | | Merge branch 'adam-fix-group-web-url' into 'master' Sean McGivern2016-10-213-16/+25
|\ \ \ \ \
| * | | | | Change "Group#web_url" to return "/groups/twitter" rather than "/twitter".Adam Niedzielski2016-10-213-16/+25
* | | | | | Merge branch 'bugfix/add_hover_to_trash_icon' into 'master' Annabel Dunstone Gray2016-10-212-1/+2
|\ \ \ \ \ \
| * | | | | | Add hover to trash icon in notesblackst0ne2016-10-212-1/+2
* | | | | | | Merge branch 'compare-ellipsis-line' into 'master' Fatih Acet2016-10-211-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixed compare ellipsis messing with layoutPhil Hughes2016-10-211-1/+1
* | | | | | | | Merge branch 'runners-paginate' into 'master' Rémy Coutable2016-10-213-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix error 500 on Runners page.Libor Klepáč2016-08-083-3/+3
* | | | | | | | | Merge branch 'fixed-mr-tabs-fixes' into 'master' Fatih Acet2016-10-214-48/+62
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Fixed issue when images are loading it would push off the tabsfixed-mr-tabs-fixesPhil Hughes2016-10-201-2/+8
| * | | | | | | | Fixed issues with sticky mr tabs & sidebarPhil Hughes2016-10-204-46/+54
* | | | | | | | | Merge branch 'fix_project_member_access_levels' into 'master' Sean McGivern2016-10-215-1/+64
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix project member access levelsfix_project_member_access_levelsValery Sizov2016-10-215-1/+64
* | | | | | | | | | Merge branch 'master' into 'master' Rémy Coutable2016-10-211-0/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Replace builds_emails_service.png to fit to new layout of GitLabChristian Meter2016-07-071-0/+0
* | | | | | | | | | | Merge branch 'sh-fix-label-uniquness-migration' into 'master' Rémy Coutable2016-10-211-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix broken label uniqueness label migrationStan Hu2016-10-211-2/+2
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'change-rubocop-to-2-1' into 'master' Robert Speicher2016-10-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Change target Ruby version for Rubocop to 2.1.change-rubocop-to-2-1Adam Niedzielski2016-10-201-1/+1
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'patch-1' into 'master' Rémy Coutable2016-10-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix `ref` parameter name for `commits/statuses` Pierre de La Morinerie2016-06-231-1/+1
* | | | | | | | | | | | Merge branch '14192-issues-closed-by-merge-requests-using-metrics-data' into ...Yorick Peterse2016-10-213-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests m...14192-issues-closed-by-merge-requests-using-metrics-dataPaco Guzman2016-10-203-2/+16
* | | | | | | | | | | | Merge branch 'sh-disable-warm-asset-cache-ci' into 'master' Rémy Coutable2016-10-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Disable warming of the asset cache in Spinach tests under CIStan Hu2016-10-211-1/+1
* | | | | | | | | | | | | Merge branch 'edit-glossary' into 'master' Sean Packham2016-10-211-139/+246
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | added skipped definitionedit-glossaryevhoffmann2016-10-201-0/+2
| * | | | | | | | | | | | updated some links in definitionsevhoffmann2016-10-201-11/+23
| * | | | | | | | | | | | a round of terms and editsevhoffmann2016-10-191-137/+230
* | | | | | | | | | | | | Merge branch '12622-backup-restore-doesn-t-clear-cache-resulting-in-missing-b...Valery Sizov2016-10-212-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix: Backup restore doesn't clear cache12622-backup-restore-doesn-t-clear-cache-resulting-in-missing-branches-and-tagsValery Sizov2016-10-202-0/+3
* | | | | | | | | | | | | Merge branch '3212-trim-white-space-at-start-and-end-when-creating-new-projec...Alfredo Sumaran2016-10-202-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Trim project_path whitespace on form submitLinus G Thiel2016-10-202-0/+6
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'fix-ruby-2-1-failures' into 'master' Stan Hu2016-10-201-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't use Hash#slice since it's not supported in Ruby 2.1fix-ruby-2-1-failuresRémy Coutable2016-10-201-3/+8
* | | | | | | | | | | | | Merge branch 'fix/validate-board-limit' into 'master' Douwe Maan2016-10-201-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | [ci skip] Add a comment explaining validate_board_limit callbackfix/validate-board-limitDouglas Barbosa Alexandre2016-10-201-0/+7
* | | | | | | | | | | | | Merge branch 'pass-namespace-gitlab-project-import' into 'master' Stan Hu2016-10-202-25/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix GitLab project import when a user has access only to their default namesp...pass-namespace-gitlab-project-importAdam Niedzielski2016-10-201-0/+1
| * | | | | | | | | | | | | Test GitLab project import for a user with only their default namespace.Adam Niedzielski2016-10-201-25/+28
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |