summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* delete remaining images (old ones)docs/add-features-groupsMarcia Ramos2017-07-1411-0/+0
* update linksMarcia Ramos2017-07-142-2/+2
* update linksMarcia Ramos2017-07-143-6/+6
* refactor groups docMarcia Ramos2017-07-1418-145/+2
* create group indexMarcia Ramos2017-07-141-0/+207
* Merge branch 'fix-exact-matches-of-username-and-email-on-top-of-the-user-sear...Sean McGivern2017-07-145-6/+25
|\
| * Fixes the user order being overriden in the autocomplete controllerfix-exact-matches-of-username-and-email-on-top-of-the-user-searchTiago Botelho2017-07-145-6/+25
* | Merge branch 'changes_in_msgid_in_synchronization_gitlab.pot' into 'master'Sean McGivern2017-07-147-23/+23
|\ \
| * | changes in msgid in synchronization gitlab.pot黄涛2017-07-147-23/+23
* | | Merge branch 'pass-before-script-as-is' into 'master'Grzegorz Bizon2017-07-145-25/+80
|\ \ \
| * | | Pass before_script and script as-is preserving arrayspass-before-script-as-isKamil Trzcinski2017-07-075-25/+80
* | | | Merge branch '34075-pipelines-count-mt' into 'master'Phil Hughes2017-07-1410-18/+94
|\ \ \ \
| * | | | Update Pipeline's badge count in Merge Request and Commits view to match real...Filipa Lacerda2017-07-1410-18/+94
|/ / / /
* | | | Merge branch 'fix/gb/recover-from-renaming-project-with-container-images' int...Sean McGivern2017-07-147-38/+117
|\ \ \ \
| * | | | Implement memoization in project correctly this timefix/gb/recover-from-renaming-project-with-container-imagesGrzegorz Bizon2017-07-141-1/+3
| * | | | Remove one assertion from projects controller specsGrzegorz Bizon2017-07-141-3/+2
| * | | | Memoize result of checking container images on projectGrzegorz Bizon2017-07-141-1/+1
| * | | | Add changelog for renaming project with images fixGrzegorz Bizon2017-07-141-0/+4
| * | | | Adds specs for renaming a project with container imagesGrzegorz Bizon2017-07-141-0/+15
| * | | | Fix rubocop offense in projects controller specsGrzegorz Bizon2017-07-141-1/+1
| * | | | Add specs for changing default branch in a projectGrzegorz Bizon2017-07-142-10/+26
| * | | | Recover from renaming project that has container imagesGrzegorz Bizon2017-07-136-29/+72
* | | | | Merge branch 'refactor-user-bundle' into 'master'Clement Ho2017-07-148-242/+240
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Refactor user bundleMike Greiling2017-07-148-242/+240
|/ / / /
* | | | Merge branch 'fix/sm/32032-remove-the-rest-of-trigger_schedule-related-codes'...Grzegorz Bizon2017-07-142-9/+1
|\ \ \ \
| * | | | Remove trigger_schedule_attributes and factory :ci_trigger_for_trigger_schedulefix/sm/32032-remove-the-rest-of-trigger_schedule-related-codesShinya Maeda2017-07-132-9/+1
* | | | | Merge branch '19629-remove-inactive-tokens-list' into 'master'Filipa Lacerda2017-07-144-29/+18
|\ \ \ \ \
| * | | | | Update test description to reflect behaviour19629-remove-inactive-tokens-listkushalpandya2017-07-141-1/+1
| * | | | | Add changelog entrykushalpandya2017-07-141-0/+4
| * | | | | Update tests to cover removal of inactive tokens tablekushalpandya2017-07-142-9/+13
| * | | | | Remove inactive tokens tablekushalpandya2017-07-141-19/+0
* | | | | | Merge branch 'revert-73579e66' into 'master'Grzegorz Bizon2017-07-145-52/+4
|\ \ \ \ \ \
| * | | | | | Revert "Merge branch 'revert-2c879643' into 'master'"Sean McGivern2017-07-145-52/+4
|/ / / / / /
* | | | | | Merge branch 'backport-ee-mysql2-version' into 'master'Sean McGivern2017-07-142-3/+3
|\ \ \ \ \ \
| * | | | | | Update the mysql2 gem to v0.4.5Nick Thomas2017-07-142-3/+3
* | | | | | | Merge branch 'instrument-ability' into 'master'Yorick Peterse2017-07-141-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Instrument Abilityinstrument-abilitySean McGivern2017-07-141-0/+4
* | | | | | | | Merge branch 'gitlab-git-repository-log' into 'master'Sean McGivern2017-07-147-87/+113
|\ \ \ \ \ \ \ \
| * | | | | | | | Indirectly migrate count_commits_between to GitalyJacob Vosmaer2017-07-131-1/+1
| * | | | | | | | More Gitaly annotationsJacob Vosmaer2017-07-135-0/+22
| * | | | | | | | Change Git::Repository#log to return CommitsJacob Vosmaer2017-07-133-86/+90
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'bvl-shared-views-for-protected-refs' into 'master'Sean McGivern2017-07-1423-213/+258
|\ \ \ \ \ \ \ \
| * | | | | | | | Use shared protected tag views for CE-partialsbvl-shared-views-for-protected-refsBob Van Landuyt2017-07-1411-103/+122
| * | | | | | | | Use shared protected branches views for CE-partialsBob Van Landuyt2017-07-1412-110/+136
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'find-file-no-longer-inline' into 'master'Filipa Lacerda2017-07-145-12/+10
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | missed one...find-file-no-longer-inlinePhil Hughes2017-07-131-5/+0
| * | | | | | | Move find file URL out of global variablePhil Hughes2017-07-134-7/+10
* | | | | | | | Merge branch 'fixes-for-internal-auth-disabled' into 'master'Sean McGivern2017-07-1440-86/+247
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixes needed when GitLab sign-in is not enabledRobin Bobbitt2017-07-1340-86/+247
* | | | | | | | | Merge branch '35035-sidebar-job-spaces' into 'master'Phil Hughes2017-07-143-4/+12
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |