summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Disable recent search on issue boardsdisable-recent-search-on-boardsPhil Hughes2017-04-131-7/+8
| | | | Closes #30919
* Merge branch '30642-fix-recent-search-history-icon-alignment-in-safari' into ↵Clement Ho2017-04-131-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-safariEric Eastwood2017-04-121-14/+12
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30642
* | Merge branch ↵Sean McGivern2017-04-122-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-rootRémy Coutable2017-04-122-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 Maan2017-04-121-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-constantRobert Speicher2017-04-121-2/+2
| | | |
* | | | Merge branch 'use-avatars-in-activity-view' into 'master' Douwe Maan2017-04-127-27/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use avatars instead of icons in activity view See merge request !10596
| * | | | Move event icons into events_helperuse-avatars-in-activity-viewAnnabel Dunstone Gray2017-04-123-21/+31
| | | | |
| * | | | Add helper for using avatars vs iconsAnnabel Dunstone Gray2017-04-116-27/+19
| | | | |
| * | | | Reuse system notes helper for profile event iconsAnnabel Dunstone Gray2017-04-117-25/+20
| | | | |
| * | | | Only show icons on profile page; change to case statementAnnabel Dunstone Gray2017-04-114-18/+21
| | | | |
| * | | | Use avatars instead of icons in activity viewAnnabel Dunstone Gray2017-04-105-24/+43
| | | | |
* | | | | Merge branch '22714-update-all-instances-of-fa-refresh' into 'master' Alfredo Sumaran2017-04-127-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 Torres2017-04-117-8/+12
| | | | | |
* | | | | | Merge branch '30858-system-notes-indent' into 'master' Jacob Schatz2017-04-121-4/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Indent system notes on desktop screens Closes #30858 See merge request !10667
| * | | | | | Indent system notes on desktop screensAnnabel Dunstone Gray2017-04-121-4/+12
| | | | | | |
* | | | | | | Merge branch 'fix-pdflab-paths' into 'master' Jacob Schatz2017-04-122-156/+171
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pdflab code including file paths See merge request !10632
| * | | | | | | Fix pdflab code including file pathsfix-pdflab-pathsSam Rose2017-04-112-156/+171
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'change-merged-icon' into 'master' Jacob Schatz2017-04-121-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update merged icon See merge request !10635
| * | | | | | | Update merged iconchange-merged-iconAnnabel Dunstone Gray2017-04-111-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'zero-downtime-migrations' into 'master' Douwe Maan2017-04-128-77/+1071
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare for zero downtime migrations See merge request !9976
| * | | | | | | | Prepare for zero downtime migrationszero-downtime-migrationsYorick Peterse2017-04-128-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 Hu2017-04-122-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use preload to avoid Rails using JOIN See merge request !10666
| * | | | | | | | | Add changelog entryLin Jen-Shin2017-04-131-0/+4
| | | | | | | | | |
| * | | | | | | | | Use preload to avoid Rails using JOINLin Jen-Shin2017-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://sentry.gitlap.com/gitlab/gitlabcom/issues/26786/
* | | | | | | | | | Merge branch 'reset-new-branch-button' into 'master' Alfredo Sumaran2017-04-123-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-123-136/+170
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'patch-15' into 'master' Achilleas Pipinellis2017-04-121-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to environments on kubernetes.md See merge request !10555
| * | | | | | | | | | Add link to environments on kubernetes.mdMark Pundsack2017-04-121-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '27729-improve-webpack-dev-environment' into 'master' Alfredo Sumaran2017-04-126-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 Greiling2017-04-126-8/+45
|/ / / / / / / / /
* | | | | | | | | Merge branch '2120-issues-search-bar-not-picking-up' into 'master' Annabel Dunstone Gray2017-04-122-1/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix filtered search input width for IE Closes #30856 See merge request !10662
| * | | | | | | | | Fix filtered search input width for IEClement Ho2017-04-122-1/+5
| | | | | | | | | |
* | | | | | | | | | Merge branch 'docs-add-auth-to-topics-page' into 'master' Marcia Ramos2017-04-122-4/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add auth to topics page See merge request !10643
| * | | | | | | | | fix broken linkdocs-add-auth-to-topics-pageMarcia Ramos2017-04-121-1/+1
| | | | | | | | | |
| * | | | | | | | | fix ee linksMarcia Ramos2017-04-121-2/+2
| | | | | | | | | |
| * | | | | | | | | add line to the end of the fileMarcia Ramos2017-04-121-1/+1
| | | | | | | | | |
| * | | | | | | | | add auth to topics pageMarcia Ramos2017-04-121-0/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'fix-missing-capitalisation-buttons' into 'master' Clement Ho2017-04-122-4/+8
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed missing capitalisation on buttons See merge request !10631
| * | | | | | | | | Fixed missing help ui view capitalisation buttonsfix-missing-capitalisation-buttonsJose Ivan Vargas2017-04-112-4/+8
| | | | | | | | | |
* | | | | | | | | | Merge branch 'poll-test-fix' into 'master' Filipa Lacerda2017-04-121-36/+57
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed random failures with Poll spec Closes #30824 See merge request !10654
| * | | | | | | | | Fixed random failures with Poll specpoll-test-fixPhil Hughes2017-04-121-36/+57
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly waits for requests to finish before testing anything. Previously it was waiting for a set amount of time which could possibly cause failures dependant on how quickly these execute Stops any polling requests once done so that the error callback doesn't get called with a 404 Closes #30824
* | | | | | | | | Merge branch 'fix_spaces_in_label_title' into 'master' Sean McGivern2017-04-123-0/+26
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Remove heading and trailing spaces from label's color and title See merge request !10603
| * | | | | | | | Remove heading and trailing spaces from label's color and titleblackst0ne2017-04-123-0/+26
| | | | | | | | |
* | | | | | | | | Merge branch 'contributing-ci-templates' into 'master' Rémy Coutable2017-04-122-1/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include CONTRIBUTING.md file when importing .gitlab-ci.yml templates See merge request !10653
| * | | | | | | | | Include CONTRIBUTING.md file when importing .gitlab-ci.yml templatescontributing-ci-templatesAdam Niedzielski2017-04-122-1/+6
| | | | | | | | | |
* | | | | | | | | | Merge branch 'improve-testing-documentation' into 'master' Robert Speicher2017-04-122-99/+375
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the testing documentation Closes #29499 and #29623 See merge request !10161
| * | | | | | | | | | Improve the testing documentationimprove-testing-documentationRémy Coutable2017-04-121-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | Fix link againRémy Coutable2017-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>