Commit Graph

49954 Commits

Author SHA1 Message Date
Luke "Jared" Bennett b24cb99856
Updated specs 2017-04-13 12:50:03 +01:00
Luke "Jared" Bennett c0af1fc4be
Remove helper 2017-04-13 12:14:31 +01:00
Luke "Jared" Bennett deb56f21cb
[ci skip] Use favicon full path 2017-04-13 11:09:20 +01:00
Alfredo Sumaran 9daf4f646b Merge branch '30779-show-mr-subnav-issue-tracker' into 'master'
Show sub-nav under Merge Requests when issue tracker is non-default

Closes #30779

See merge request !10658
2017-04-13 07:55:16 +00:00
Kushal Pandya 49759fbee1 Show sub-nav under Merge Requests when issue tracker is non-default 2017-04-13 07:55:15 +00:00
Grzegorz Bizon 37ab389139 Revert "Fix registry for projects with uppercases in path"
This reverts commit 22726942fe.
2017-04-13 09:18:46 +02:00
Grzegorz Bizon 22726942fe Fix registry for projects with uppercases in path 2017-04-13 09:11:41 +02:00
Clement Ho d7a527163b Merge branch '30642-fix-recent-search-history-icon-alignment-in-safari' into 'master'
Fix recent searches icon alignment in Safari

Closes #30642

See merge request !10606
2017-04-13 00:24:49 +00:00
Sean McGivern 75af8d9232 Merge branch '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
2017-04-12 21:45:25 +00:00
Douwe Maan 2bc9a14f68 Merge branch 'rs-fix-already-defined-constant' into 'master'
Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error

See merge request !10664
2017-04-12 21:42:44 +00:00
Douwe Maan 3e19ecae17 Merge branch 'use-avatars-in-activity-view' into 'master'
Use avatars instead of icons in activity view

See merge request !10596
2017-04-12 21:41:15 +00:00
Alfredo Sumaran d5143af98e Merge branch '22714-update-all-instances-of-fa-refresh' into 'master'
Update all instances of "fa-refresh" to "fa-spinner"

Closes #22714

See merge request !10490
2017-04-12 21:30:39 +00:00
Jacob Schatz e802a881d8 Merge branch '30858-system-notes-indent' into 'master'
Indent system notes on desktop screens

Closes #30858

See merge request !10667
2017-04-12 20:56:18 +00:00
Jacob Schatz 5c01d089b6 Merge branch 'fix-pdflab-paths' into 'master'
Fix pdflab code including file paths

See merge request !10632
2017-04-12 20:55:43 +00:00
Jacob Schatz 9d96167b8a Merge branch 'change-merged-icon' into 'master'
Update merged icon

See merge request !10635
2017-04-12 20:49:34 +00:00
Douwe Maan 3584f7dd52 Merge branch 'zero-downtime-migrations' into 'master'
Prepare for zero downtime migrations

See merge request !9976
2017-04-12 20:43:12 +00:00
Annabel Dunstone Gray 8552d120d1 Move event icons into events_helper 2017-04-12 15:30:31 -05:00
Stan Hu 6ce2cc619c Merge branch 'fix-preloading-merge_request_diff' into 'master'
Use preload to avoid Rails using JOIN

See merge request !10666
2017-04-12 20:16:26 +00:00
Alfredo Sumaran 0fa00e8461 Merge branch 'reset-new-branch-button' into 'master'
Reset New branch button when issue state changes

Closes #21292

See merge request !5962
2017-04-12 19:40:35 +00:00
💃 Winnie 💃 83c9d8cf86 Reset New branch button when issue state changes 2017-04-12 19:40:35 +00:00
Achilleas Pipinellis defdf45ab5 Merge branch 'patch-15' into 'master'
Add link to environments on kubernetes.md

See merge request !10555
2017-04-12 19:34:01 +00:00
Mark Pundsack 6f136ba116 Add link to environments on kubernetes.md 2017-04-12 19:33:59 +00:00
Annabel Dunstone Gray a7c6a47aad Indent system notes on desktop screens 2017-04-12 14:20:31 -05:00
Alfredo Sumaran b41fc6275c Merge branch '27729-improve-webpack-dev-environment' into 'master'
Improve webpack-dev-server compatibility with non-localhost setups.

Closes #27729

See merge request !10604
2017-04-12 19:05:26 +00:00
Mike Greiling 10deca824e Improve webpack-dev-server compatibility with non-localhost setups. 2017-04-12 19:05:23 +00:00
Lin Jen-Shin 2263ce9760 Add changelog entry 2017-04-13 02:44:41 +08:00
Eric Eastwood ae5c16f777 Fix recent searches icon alignment in Safari
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30642
2017-04-12 13:44:12 -05:00
Lin Jen-Shin 39d07799f1 Use preload to avoid Rails using JOIN
Fixes https://sentry.gitlap.com/gitlab/gitlabcom/issues/26786/
2017-04-13 02:37:27 +08:00
Robert Speicher 58cd4c48e6 Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error 2017-04-12 13:59:35 -04:00
Annabel Dunstone Gray c68ea29d5d Merge branch '2120-issues-search-bar-not-picking-up' into 'master'
Fix filtered search input width for IE

Closes #30856

See merge request !10662
2017-04-12 17:24:58 +00:00
Marcia Ramos fe36a9c846 Merge branch 'docs-add-auth-to-topics-page' into 'master'
Add auth to topics page

See merge request !10643
2017-04-12 17:17:26 +00:00
Clement Ho 1585eaf64b Merge branch 'fix-missing-capitalisation-buttons' into 'master'
Fixed missing capitalisation on buttons

See merge request !10631
2017-04-12 16:26:55 +00:00
Yorick Peterse 223d8a3d26
Prepare for zero downtime migrations
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.
2017-04-12 18:15:19 +02:00
Clement Ho f23a0ab66e Fix filtered search input width for IE 2017-04-12 10:57:37 -05:00
Filipa Lacerda 0b35dd0742 Merge branch 'poll-test-fix' into 'master'
Fixed random failures with Poll spec

Closes #30824

See merge request !10654
2017-04-12 15:57:03 +00:00
Rémy Coutable 755325c827 Fix the `gitlab:gitlab_shell:check` task
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>
2017-04-12 17:40:19 +02:00
Sean McGivern 18188a5346 Merge branch 'fix_spaces_in_label_title' into 'master'
Remove heading and trailing spaces from label's color and title

See merge request !10603
2017-04-12 15:40:12 +00:00
Rémy Coutable 8fa2c5cae5 Merge branch 'contributing-ci-templates' into 'master'
Include CONTRIBUTING.md file when importing .gitlab-ci.yml templates

See merge request !10653
2017-04-12 15:27:30 +00:00
Robert Speicher 22c4050058 Merge branch 'improve-testing-documentation' into 'master'
Improve the testing documentation

Closes #29499 and #29623

See merge request !10161
2017-04-12 15:14:28 +00:00
Annabel Dunstone Gray 376f2891f1 Merge branch 'user-activity-scroll-bar' into 'master'
Set user contribution calendar `overflow-x: scroll` more precisely

Closes #30738

See merge request !10636
2017-04-12 14:36:21 +00:00
Douwe Maan 1ca5f0543c Merge branch '29056-backport-ee-cleanup-database-file' into 'master'
removes redundant code from database.rb

Closes #29056

See merge request !10583
2017-04-12 14:13:46 +00:00
Douwe Maan 50715a9292 Merge branch 'improve-discussions-feature-attempt-1' into 'master'
Improve discussion_comments_spec perf

See merge request !10648
2017-04-12 14:03:37 +00:00
Rémy Coutable f7068a5eec Merge branch 'patch-8' into 'master'
Fix grammar

See merge request !10639
2017-04-12 13:47:29 +00:00
Sean Packham (GitLab) d41bbd2379 Merge branch '27755-update-pipelines-documentation' into 'master'
Resolve "Update Pipelines documentation"

Closes #27755

See merge request !10600
2017-04-12 13:21:51 +00:00
Phil Hughes 194955fe51 Fixed random failures with Poll spec
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
2017-04-12 13:42:01 +01:00
Adam Niedzielski 7dfeaabb5a Include CONTRIBUTING.md file when importing .gitlab-ci.yml templates 2017-04-12 14:38:59 +02:00
Kamil Trzciński 9e99436d1d Merge branch 'zj-fix-coverage-bug' into 'master'
Return nil as coverage instead of a File object

See merge request !10633
2017-04-12 12:23:51 +00:00
Sean McGivern ebb358e922 Merge branch 'zj-improve-template' into 'master'
Let uses hide verbose output by default

See merge request !10650
2017-04-12 12:09:39 +00:00
Z.J. van de Weg 00688e438c Let uses hide verbose output by default
[ci skip]
2017-04-12 14:01:20 +02:00
Rémy Coutable 78ff726d62 Merge branch 'fix/gb/qa/fix-outdated-admin-area-link-title' into 'master'
Fix outdated 'Admin area' link label in GitLab QA

Closes gitlab-qa#41

See merge request !10646
2017-04-12 11:54:16 +00:00