summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Revert Autodevops gear animation39798-revert-gear-animationEric Eastwood2017-11-063-23/+2
| | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39798
* Merge branch 'gitaly-client-path-fix' into 'master'Douwe Maan2017-11-031-1/+1
|\ | | | | | | | | Fix invalid Gitaly ClientPath config See merge request gitlab-org/gitlab-ce!15159
| * 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 environment Closes #39752 See merge request gitlab-org/gitlab-ce!15167
| * | Avoid regenerating the ref path for the environmentsh-fix-environment-slug-generationStan Hu2017-11-023-1/+25
| | | | | | | | | | | | Closes #39752
* | | Merge branch '39684-issue-boards-space' into 'master'Phil Hughes2017-11-031-3/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove white space at bottom of issue boards Closes #39684 See merge request gitlab-org/gitlab-ce!15166
| * | | 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 calls Closes #39726 See merge request gitlab-org/gitlab-ce!15155
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Refactor controller calls into services Closes gitlab-ee#3544 See merge request gitlab-org/gitlab-ce!15023
| * | | | | 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" Closes #39417 See merge request gitlab-org/gitlab-ce!15015
| * | | | | 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 Epics module See merge request gitlab-org/gitlab-ce!15162
| * | | | | 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 requests See merge request gitlab-org/gitlab-ce!15158
| * | | | | | 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' ↵Yorick Peterse2017-11-027-1/+128
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Add a `merge_request_diff_id` column to `merge_requests`" See merge request gitlab-org/gitlab-ce!15035
| * | | | | | | Set merge_request_diff_id on MR when creatingSean McGivern2017-11-023-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once we migrate existing MRs to have this column, we will be able to get the latest diff for a single merge request more efficiently, and (more importantly) get all latest diffs for a collection of MRs efficiently.
| * | | | | | | Add a column linking an MR to its diffSean McGivern2017-11-026-1/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already had this the other way around (merge_request_diffs.merge_request_id), but this is needed to gather only the most recent diffs for a set of merge requests.
* | | | | | | | Merge branch 'refactor-responsive-tables-for-nested-error' into 'master'Annabel Dunstone Gray2017-11-027-77/+103
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor responsive table styles to support nested error block See merge request gitlab-org/gitlab-ce!15145
| * | | | | | | | Refactor responsive table styles to support nested error blockrefactor-responsive-tables-for-nested-errorEric Eastwood2017-11-027-77/+103
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Split layout from the styles of the row - Move command `.append-` `.prepend-` styles to bottom of source order - Actually applies styles over others in more situations which is probably what is expected when you add it to an element - Also allows us to get rid of some styles that were trying to get around this fact See https://i.imgur.com/IE50PK6.png Which is used in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15064 Design from https://gitlab.com/gitlab-org/gitlab-ce/issues/38464
* | | | | | | | Merge branch 'gitaly-ff-merge' into 'master'Rémy Coutable2017-11-025-30/+115
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's OperationService.UserFFBranch RPC Closes gitaly#693 See merge request gitlab-org/gitlab-ce!15040
| * | | | | | | | Incorporate Gitaly's OperationService.UserFFBranch RPCgitaly-ff-mergeAlejandro Rodríguez2017-10-315-30/+115
| | | | | | | | |
* | | | | | | | | Merge branch 'winh-update-nvmrc' into 'master'Phil Hughes2017-11-021-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update .nvmrc to v9.0.0 (current stable) See merge request gitlab-org/gitlab-ce!15149
| * | | | | | | | | Update .nvmrc to current stable (v9.0.0)winh-update-nvmrcWinnie Hellmann2017-11-021-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'icons-ci-icons' into 'master'Filipa Lacerda2017-11-0264-281/+293
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert Icons in CI to SVG Sprite Icons See merge request gitlab-org/gitlab-ce!14567
| * | | | | | | | | | Fix for Dropdown Icon Positionicons-ci-iconsTim Zallmann2017-11-011-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Needed to change 0px to 0Tim Zallmann2017-10-301-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Missing Comma addedTim Zallmann2017-10-301-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Fixed different sizesTim Zallmann2017-10-302-6/+33
| | | | | | | | | | |
| * | | | | | | | | | Added Missing SemicolonTim Zallmann2017-10-301-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Improved Var Caching, Line Setup, SpecsTim Zallmann2017-10-303-18/+20
| | | | | | | | | | |
| * | | | | | | | | | fdescribe remove :-/Tim Zallmann2017-10-301-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Updated icon.vue to be more inline with other components + added spec for itTim Zallmann2017-10-303-8/+49
| | | | | | | | | | |
| * | | | | | | | | | Lets try with trigger('click')Tim Zallmann2017-10-302-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Fixes another problem that happens during knapsack testingTim Zallmann2017-10-301-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Fixing Tests and CSS displayTim Zallmann2017-10-303-10/+18
| | | | | | | | | | |
| * | | | | | | | | | Fixes one icon testTim Zallmann2017-10-301-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Test FixesTim Zallmann2017-10-303-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Fixes for TestsTim Zallmann2017-10-3013-55/+34
| | | | | | | | | | |
| * | | | | | | | | | Update Action IconsTim Zallmann2017-10-3010-25/+20
| | | | | | | | | | |
View Lorry Controller Status