Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add lighter color variables. Fix active note color.pms-lighter-colors | Pedro Moreira da Silva | 2017-04-13 | 2 | -13/+21 |
| | |||||
* | Merge branch 'fix/gb/fix-registry-for-uppercased-project-paths' into 'master' | Kamil Trzciński | 2017-04-13 | 4 | -8/+35 |
|\ | | | | | | | | | | | | | Fix registry for projects with uppercases in path Closes #30880 See merge request !10674 | ||||
| * | Sanitize container repository path in model classfix/gb/fix-registry-for-uppercased-project-paths | Grzegorz Bizon | 2017-04-13 | 3 | -5/+16 |
| | | |||||
| * | Fix registry for projects with uppercases in path | Grzegorz Bizon | 2017-04-13 | 2 | -4/+20 |
| | | |||||
* | | Merge branch '30622-resolve-note-loading-icon-gone' into 'master' | Filipa Lacerda | 2017-04-13 | 3 | -4/+9 |
|\ \ | | | | | | | | | | | | | | | | | | | Resolve "Resolve note loading icon gone" Closes #30622 See merge request !10628 | ||||
| * | | Review changes30622-resolve-note-loading-icon-gone | Luke "Jared" Bennett | 2017-04-12 | 1 | -0/+5 |
| | | | |||||
| * | | Fix resolve spinner and add test | Luke "Jared" Bennett | 2017-04-11 | 3 | -4/+4 |
| | | | |||||
* | | | Merge branch '30188-handle-remove-branch-failure' into 'master' | Filipa Lacerda | 2017-04-13 | 3 | -5/+58 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | fix js error in MR remove branch failure handler Closes #30188 See merge request !10304 | ||||
| * | | | tests for success and failure of deleting branch from MR page30188-handle-remove-branch-failure | Simon Knox | 2017-04-13 | 3 | -1/+54 |
| | | | | |||||
| * | | | fix js error in MR remove branch failure handler | Simon Knox | 2017-04-12 | 1 | -4/+4 |
| | | | | |||||
* | | | | Merge branch 'remove-iife-cycle-analytics-bundle' into 'master' 26510-should-project-updated-time-actually-be-the-last-activity-time | Filipa Lacerda | 2017-04-13 | 12 | -697/+682 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove IIFEs from files in cycle_analytics_bundle.js See merge request !10613 | ||||
| * | | | | Remove IIFEs from files in cycle_analytics_bundle.jsremove-iife-cycle-analytics-bundle | Alfredo Sumaran | 2017-04-10 | 12 | -697/+682 |
| | | | | | |||||
* | | | | | Merge branch 'remove-iife-boards-bundle' into 'master' | Filipa Lacerda | 2017-04-13 | 18 | -1269/+1232 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove IIFEs in boards_bundle.js See merge request !10612 | ||||
| * | | | | | Remove IIFEs in boards_bundle.jsremove-iife-boards-bundle | Alfredo Sumaran | 2017-04-10 | 18 | -1269/+1232 |
| | | | | | | |||||
* | | | | | | Merge branch '30779-show-mr-subnav-issue-tracker' into 'master' | Alfredo Sumaran | 2017-04-13 | 12 | -9/+41 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show sub-nav under Merge Requests when issue tracker is non-default Closes #30779 See merge request !10658 | ||||
| * | | | | | Show sub-nav under Merge Requests when issue tracker is non-default | Kushal Pandya | 2017-04-13 | 12 | -9/+41 |
|/ / / / / | |||||
* | | | | | Revert "Fix registry for projects with uppercases in path" | Grzegorz Bizon | 2017-04-13 | 2 | -20/+4 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 22726942fe0b6c11c20de070cc9784de12ca2ce6. | ||||
* | | | | | Fix registry for projects with uppercases in path | Grzegorz Bizon | 2017-04-13 | 2 | -4/+20 |
| | | | | | |||||
* | | | | | Merge branch '30642-fix-recent-search-history-icon-alignment-in-safari' into ↵ | Clement Ho | 2017-04-13 | 1 | -14/+12 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix recent searches icon alignment in Safari Closes #30642 See merge request !10606 | ||||
| * | | | | | Fix recent searches icon alignment in Safari30642-fix-recent-search-history-icon-alignment-in-safari | Eric Eastwood | 2017-04-12 | 1 | -14/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30642 | ||||
* | | | | | | Merge branch ↵ | Sean McGivern | 2017-04-12 | 2 | -7/+11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'omnibus-gitlab-1993-check-shell-repositories-path-group-is-root' into 'master' Fix the `gitlab:gitlab_shell:check` task Closes omnibus-gitlab#1993 See merge request !10645 | ||||
| * | | | | | | Fix the `gitlab:gitlab_shell:check` taskomnibus-gitlab-1993-check-shell-repositories-path-group-is-root | Rémy Coutable | 2017-04-12 | 2 | -7/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the `gitlab:gitlab_shell:check` task check that the repositories storage path are owned by the `root` group Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | | | | Merge branch 'rs-fix-already-defined-constant' into 'master' | Douwe Maan | 2017-04-12 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error See merge request !10664 | ||||
| * | | | | | | | Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition errorrs-fix-already-defined-constant | Robert Speicher | 2017-04-12 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'use-avatars-in-activity-view' into 'master' | Douwe Maan | 2017-04-12 | 7 | -27/+46 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use avatars instead of icons in activity view See merge request !10596 | ||||
| * | | | | | | | | Move event icons into events_helperuse-avatars-in-activity-view | Annabel Dunstone Gray | 2017-04-12 | 3 | -21/+31 |
| | | | | | | | | | |||||
| * | | | | | | | | Add helper for using avatars vs icons | Annabel Dunstone Gray | 2017-04-11 | 6 | -27/+19 |
| | | | | | | | | | |||||
| * | | | | | | | | Reuse system notes helper for profile event icons | Annabel Dunstone Gray | 2017-04-11 | 7 | -25/+20 |
| | | | | | | | | | |||||
| * | | | | | | | | Only show icons on profile page; change to case statement | Annabel Dunstone Gray | 2017-04-11 | 4 | -18/+21 |
| | | | | | | | | | |||||
| * | | | | | | | | Use avatars instead of icons in activity view | Annabel Dunstone Gray | 2017-04-10 | 5 | -24/+43 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch '22714-update-all-instances-of-fa-refresh' into 'master' | Alfredo Sumaran | 2017-04-12 | 7 | -8/+12 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update all instances of "fa-refresh" to "fa-spinner" Closes #22714 See merge request !10490 | ||||
| * | | | | | | | | | Update all instances of "fa-refresh" to "fa-spinner" | Andrew Torres | 2017-04-11 | 7 | -8/+12 |
| | | | | | | | | | | |||||
* | | | | | | | | | | Merge branch '30858-system-notes-indent' into 'master' | Jacob Schatz | 2017-04-12 | 1 | -4/+12 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Indent system notes on desktop screens Closes #30858 See merge request !10667 | ||||
| * | | | | | | | | | | Indent system notes on desktop screens | Annabel Dunstone Gray | 2017-04-12 | 1 | -4/+12 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'fix-pdflab-paths' into 'master' | Jacob Schatz | 2017-04-12 | 2 | -156/+171 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pdflab code including file paths See merge request !10632 | ||||
| * | | | | | | | | | | | Fix pdflab code including file pathsfix-pdflab-paths | Sam Rose | 2017-04-11 | 2 | -156/+171 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'change-merged-icon' into 'master' | Jacob Schatz | 2017-04-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update merged icon See merge request !10635 | ||||
| * | | | | | | | | | | | Update merged iconchange-merged-icon | Annabel Dunstone Gray | 2017-04-11 | 1 | -1/+1 |
| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'zero-downtime-migrations' into 'master' | Douwe Maan | 2017-04-12 | 8 | -77/+1071 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare for zero downtime migrations See merge request !9976 | ||||
| * | | | | | | | | | | | | Prepare for zero downtime migrationszero-downtime-migrations | Yorick Peterse | 2017-04-12 | 8 | -77/+1071 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with GitLab 9.1.0 we will no longer allow downtime migrations unless absolutely necessary. This commit updates the various developer guides and adds code that is necessary to make zero downtime migrations less painful. | ||||
* | | | | | | | | | | | | | Merge branch 'fix-preloading-merge_request_diff' into 'master' | Stan Hu | 2017-04-12 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use preload to avoid Rails using JOIN See merge request !10666 | ||||
| * | | | | | | | | | | | | | Add changelog entry | Lin Jen-Shin | 2017-04-13 | 1 | -0/+4 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Use preload to avoid Rails using JOIN | Lin Jen-Shin | 2017-04-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://sentry.gitlap.com/gitlab/gitlabcom/issues/26786/ | ||||
* | | | | | | | | | | | | | | Merge branch 'reset-new-branch-button' into 'master' | Alfredo Sumaran | 2017-04-12 | 3 | -136/+170 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reset New branch button when issue state changes Closes #21292 See merge request !5962 | ||||
| * | | | | | | | | | | | | | | Reset New branch button when issue state changes | 💃 Winnie 💃 | 2017-04-12 | 3 | -136/+170 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge branch 'patch-15' into 'master' | Achilleas Pipinellis | 2017-04-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to environments on kubernetes.md See merge request !10555 | ||||
| * | | | | | | | | | | | | | | Add link to environments on kubernetes.md | Mark Pundsack | 2017-04-12 | 1 | -1/+1 |
|/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge branch '27729-improve-webpack-dev-environment' into 'master' | Alfredo Sumaran | 2017-04-12 | 6 | -8/+45 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve webpack-dev-server compatibility with non-localhost setups. Closes #27729 See merge request !10604 | ||||
| * | | | | | | | | | | | | | Improve webpack-dev-server compatibility with non-localhost setups. | Mike Greiling | 2017-04-12 | 6 | -8/+45 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch '2120-issues-search-bar-not-picking-up' into 'master' | Annabel Dunstone Gray | 2017-04-12 | 2 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix filtered search input width for IE Closes #30856 See merge request !10662 |