summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into refactor-clustersEric Eastwood2017-11-039-33/+51
|\
| * Merge branch 'sh-fix-environment-slug-generation' into 'master'Grzegorz Bizon2017-11-031-1/+5
| |\
| | * Avoid regenerating the ref path for the environmentsh-fix-environment-slug-generationStan Hu2017-11-021-1/+5
| * | 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-035-29/+31
| |\ \ \ \
| | * | | | fix typorefactor-services-for-audit-events-ceJames Lopez2017-11-021-1/+1
| | * | | | fix specsJames Lopez2017-11-021-1/+1
| | * | | | fix specsJames Lopez2017-11-021-1/+1
| | * | | | 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-313-22/+30
* | | | | | Fix tests. Remove NOT NULL constraint from cluster.user.Shinya Maeda2017-11-031-0/+3
* | | | | | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-0383-627/+728
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Resolve ""To do" should be "Todos" on Todos list page"Victor Wu2017-11-031-1/+1
| | |_|/ / | |/| | |
| * | | | 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-021-2/+1
| |\ \ \ \ \
| | * | | | | Remove Filesystem check metrics that use too much CPU to handle requestspawel/disable_nfs_metrics_checks_39730Pawel Chojnacki2017-11-021-2/+1
| * | | | | | Merge branch '37631-add-a-merge_request_diff_id-column-to-merge_requests' int...Yorick Peterse2017-11-021-0/+4
| |\ \ \ \ \ \
| | * | | | | | Set merge_request_diff_id on MR when creatingSean McGivern2017-11-021-0/+4
| * | | | | | | 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 blockrefactor-responsive-tables-for-nested-errorEric Eastwood2017-11-027-77/+103
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'icons-ci-icons' into 'master'Filipa Lacerda2017-11-0220-144/+174
| |\ \ \ \ \ \ \
| | * | | | | | | 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-302-5/+4
| | * | | | | | | Updated icon.vue to be more inline with other components + added spec for itTim Zallmann2017-10-302-8/+4
| | * | | | | | | Fixes another problem that happens during knapsack testingTim Zallmann2017-10-301-1/+1
| | * | | | | | | Fixing Tests and CSS displayTim Zallmann2017-10-302-4/+12
| | * | | | | | | Test FixesTim Zallmann2017-10-301-1/+1
| | * | | | | | | Fixes for TestsTim Zallmann2017-10-305-28/+7
| | * | | | | | | Update Action IconsTim Zallmann2017-10-304-19/+14
| | * | | | | | | Fixing IconsTim Zallmann2017-10-3011-78/+101
| | * | | | | | | Updated also Badge + Dropdown IconsTim Zallmann2017-10-302-4/+4
| | * | | | | | | Comma to muchTim Zallmann2017-10-301-1/+1
| | * | | | | | | Fix the size of a status iconTim Zallmann2017-10-301-1/+1
| | * | | | | | | Updated Static Icons from CI AreaTim Zallmann2017-10-304-22/+25
| * | | | | | | | Merge branch 'dm-remove-private-token' into 'master'Sean McGivern2017-11-0212-61/+63
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update specs for sudo behaviorDouwe Maan2017-11-021-1/+9
| | * | | | | | | | Move RSS and incoming email tokens from User Settings > Accounts to User Sett...Douwe Maan2017-11-024-28/+39
| | * | | | | | | | Remove user authentication_token columnDouwe Maan2017-11-021-0/+1