summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Re-organize queues to use for Sidekiqseparate-sidekiq-queuesYorick Peterse2016-10-2162-68/+425
* 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
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'protected-branches-bundle' into 'master' Jacob Schatz2016-10-208-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Create protected branches bundleAlfredo Sumaran2016-10-208-0/+4
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'zj-use-iid-deployment-refs' into 'master' Kamil Trzciński2016-10-203-5/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Only create refs for new deploymentszj-use-iid-deployment-refsZ.J. van de Weg2016-10-201-1/+1
| * | | | | | | | | Use deployment IID when saving refsZ.J. van de Weg2016-10-203-4/+4
* | | | | | | | | | Merge branch 'preserve-note_type-and-position' into 'master' Sean McGivern2016-10-205-16/+17
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into preserve-note_type-and-po...preserve-note_type-and-positionLin Jen-Shin2016-10-2027-99/+275
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | We want to release this in 8.13.0Lin Jen-Shin2016-10-201-2/+1
| * | | | | | | | | Add CHANGELOG entry [ci skip]Lin Jen-Shin2016-10-201-0/+2
| * | | | | | | | | Preserve note_type and position for notes from emailsLin Jen-Shin2016-10-204-16/+16
* | | | | | | | | | Merge branch 'update-duration-at-the-end-of-pipeline' into 'master' Rémy Coutable2016-10-202-3/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update duration at the end of pipelineupdate-duration-at-the-end-of-pipelineKamil Trzcinski2016-10-202-3/+1
* | | | | | | | | | | Merge branch 'render-hipchat-notification-descriptions' into 'master' Rémy Coutable2016-10-203-30/+45
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add CHANGELOG.md entryAirat Shigapov2016-10-201-0/+1
| * | | | | | | | | | | Return truncation for notification descriptions, fix minor bugs with renderingAirat Shigapov2016-10-202-12/+17
| * | | | | | | | | | | Use guard clause instead of if-else statementAirat Shigapov2016-10-201-13/+12
| * | | | | | | | | | | Tests for markdown HipChat notificationsDavid Eisner2016-10-201-6/+6
| * | | | | | | | | | | Clean up Banzai HTML for HipChatDavid Eisner2016-10-201-0/+3
| * | | | | | | | | | | Ensure absolute URLs for single lines from Banzai for HipChatDavid Eisner2016-10-201-3/+7
| * | | | | | | | | | | Absolute URLs for Banzai HTML for HipChatDavid Eisner2016-10-201-11/+21