summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use the --parallel Rubocop flag in the static-analysis and improve the job39790-use-the-parallel-rubocop-option-in-the-static-analysis-ci-jobRémy Coutable2017-11-031-7/+16
* Merge branch 'performance-bar-sql-timings' into 'master'Rémy Coutable2017-11-031-1/+1
|\
| * Fix SQL timings for the performance barYorick Peterse2017-11-031-1/+1
* | Merge branch 'bvl-unlink-fixes' into 'master'Douwe Maan2017-11-0314-18/+182
|\ \
| * | Find the LFS-objects for a fork within a the fork networkBob Van Landuyt2017-11-033-4/+57
| * | Unlink a project from a fork network when it's source was deleted.Bob Van Landuyt2017-11-034-5/+43
| * | Make sure the settings page renders when root of a fork is deletedBob Van Landuyt2017-11-037-9/+82
* | | Merge branch 'enable-scss-lint-mergeable-selector' into 'master'Annabel Dunstone Gray2017-11-0335-632/+727
|\ \ \
| * | | Enable MergeableSelector in scss-lint (for !14567)Takuya Noguchi2017-11-031-28/+31
| * | | Enable MergeableSelector in scss-lint (for !14055)Takuya Noguchi2017-11-031-26/+26
| * | | Enable MergeableSelector in scss-lint (for !14062)Takuya Noguchi2017-11-031-8/+2
| * | | Enable MergeableSelector in scss-lint (for !14398)Takuya Noguchi2017-11-031-11/+11
| * | | Enable MergeableSelector in scss-lint (for !13480)Takuya Noguchi2017-11-031-21/+17
| * | | Enable MergeableSelector in scss-lint (for !13473)Takuya Noguchi2017-11-031-7/+0
| * | | Enable MergeableSelector in scss-lint (for !13600)Takuya Noguchi2017-11-031-4/+2
| * | | Enable MergeableSelector in scss-lintTakuya Noguchi2017-11-0334-555/+666
* | | | Merge remote-tracking branch 'dev/master'Jarka Kadlecova2017-11-0321-102/+24
|\ \ \ \
| * | | | Update CHANGELOG.md for 10.1.1Winnie Hellmann2017-10-3121-102/+24
* | | | | Merge branch 'winh-namespace-rename-hooks' into 'master'Douwe Maan2017-11-039-19/+236
|\ \ \ \ \
| * | | | | Add system hooks user_rename and group_renameWinnie Hellmann2017-11-039-19/+236
|/ / / / /
* | | | | Merge branch 'rc/remove-peek-keyboard-shortcut' into 'master'Sean McGivern2017-11-031-18/+10
|\ \ \ \ \
| * | | | | Remove Peek's original keyboard shortcut (numpad 0, keycode 96)rc/remove-peek-keyboard-shortcutRémy Coutable2017-11-031-18/+10
|/ / / / /
* | | | | Merge branch 'gitaly-client-path-fix' into 'master'Douwe Maan2017-11-031-1/+1
|\ \ \ \ \
| * | | | | Fix invalid Gitaly ClientPath configgitaly-client-path-fixKim "BKC" Carlbäcker2017-11-021-1/+1
* | | | | | Merge branch 'sh-fix-environment-slug-generation' into 'master'Grzegorz Bizon2017-11-033-1/+25
|\ \ \ \ \ \
| * | | | | | Avoid regenerating the ref path for the environmentsh-fix-environment-slug-generationStan Hu2017-11-023-1/+25
* | | | | | | Merge branch '39684-issue-boards-space' into 'master'Phil Hughes2017-11-031-3/+7
|\ \ \ \ \ \ \
| * | | | | | | Remove white space at bottom of issue boards39684-issue-boards-spaceAnnabel Dunstone Gray2017-11-021-3/+7
* | | | | | | | Merge branch '39726-add-crsf-token-axios' into 'master'Phil Hughes2017-11-032-0/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Add crsf token in axios calls39726-add-crsf-token-axiosFilipa Lacerda2017-11-022-0/+8
* | | | | | | | | Merge branch 'refactor-services-for-audit-events-ce' into 'master'Grzegorz Bizon2017-11-036-29/+44
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | fix typorefactor-services-for-audit-events-ceJames Lopez2017-11-021-1/+1
| * | | | | | | | fix specsJames Lopez2017-11-021-1/+1
| * | | | | | | | fix specsJames Lopez2017-11-022-2/+3
| * | | | | | | | refactor codeJames Lopez2017-10-313-4/+3
| * | | | | | | | fix spinach failureJames Lopez2017-10-311-0/+2
| * | | | | | | | fix specsJames Lopez2017-10-311-0/+0
| * | | | | | | | fix specJames Lopez2017-10-311-2/+0
| * | | | | | | | uypdated keys controller logicJames Lopez2017-10-312-8/+3
| * | | | | | | | add applications controller logicJames Lopez2017-10-314-22/+42
* | | | | | | | | Merge branch '39417-to-do-should-be-todos-on-todos-list-page' into 'master'Annabel Dunstone Gray2017-11-033-6/+11
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Resolve ""To do" should be "Todos" on Todos list page"Victor Wu2017-11-033-6/+11
|/ / / / / / / /
* | | | | | | | Merge branch 'jk-epic-changes-ce-port' into 'master'39748-add-documentation-on-how-to-create-a-dns-entry-docsStan Hu2017-11-021-2/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove including ee moduleJarka Kadlecova2017-11-021-2/+0
* | | | | | | | | Merge branch 'pawel/disable_nfs_metrics_checks_39730' into 'master'Stan Hu2017-11-023-13/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove Filesystem check metrics that use too much CPU to handle requestspawel/disable_nfs_metrics_checks_39730Pawel Chojnacki2017-11-023-13/+6
* | | | | | | | | | Merge branch '37631-add-a-merge_request_diff_id-column-to-merge_requests' int...Yorick Peterse2017-11-027-1/+128
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Set merge_request_diff_id on MR when creatingSean McGivern2017-11-023-2/+6
| * | | | | | | | | Add a column linking an MR to its diffSean McGivern2017-11-026-1/+124
* | | | | | | | | | Merge branch 'refactor-responsive-tables-for-nested-error' into 'master'Annabel Dunstone Gray2017-11-027-77/+103
|\ \ \ \ \ \ \ \ \ \