Commit Graph

42334 Commits

Author SHA1 Message Date
Sean McGivern fe60079454 Merge branch 'auto-deploy-with-space' into 'master'
Rename "autodeploy" to "auto deploy"

Closes #25999

See merge request !8289
2016-12-27 10:52:04 +00:00
Sean McGivern 5db934372b Merge branch 'fix-build-failure-links' into 'master'
Fix build failure links in Slack

See merge request !8311
2016-12-27 10:25:18 +00:00
Kamil Trzciński 796b5b575f Merge branch 'fix-latest-pipeine-ordering-again' into 'master'
Order only for latest_successful_for

See merge request !8301
2016-12-26 23:14:39 +00:00
Kamil Trzciński f8bab6108e Merge branch 'fix-single-team' into 'master'
Fix single team selection

See merge request !8251
2016-12-26 23:11:50 +00:00
Fatih Acet 29c64545b5 Merge branch '26040-hide-scroll-top' into 'master'
Hide Scroll Top button for failed Build page

Closes #26040

See merge request !8295
2016-12-26 18:58:34 +00:00
Fatih Acet e10f19fd46 Merge branch '25909-fix-mr-list-timestamp-alignment' into 'master'
Fixes timestamp text alignment in mr-list and issue-list

Closes #25909

See merge request !8271
2016-12-26 18:49:27 +00:00
Fatih Acet 71fa7c53d9 Merge branch 'label-gfm-error-fix' into 'master'
Fixed error with GFM autocomplete when no data exists

See merge request !8288
2016-12-26 18:47:55 +00:00
Fatih Acet bbb9d05f30 Merge branch '26026-pipeline-overflow-firefox' into 'master'
Fix line breaking in nodes of the pipeline graph in firefox

Closes #26026

See merge request !8292
2016-12-26 18:44:38 +00:00
Fatih Acet 6b9933b982 Merge branch '26038-fix-confedential-warning-text-alignment' into 'master'
fixes confidential warning alignment on comment box

Closes #26038

See merge request !8293
2016-12-26 18:39:26 +00:00
Sean McGivern 738fe41437 Fix build failure links in Slack 2016-12-26 17:10:18 +00:00
Sean McGivern 7b1df37fee Merge branch 're-style-issue-new-branch' into 'master'
In issue view, remove checking branches state

See merge request !8023
2016-12-26 15:22:52 +00:00
Sean McGivern 9fb864f21a Merge branch '25705-your-commands-have-been-executed-is-overkill' into 'master'
Replace wording for slash command confirmation message

See merge request !8123
2016-12-26 15:22:33 +00:00
victorwu 8cc5333420 Replace wording for slash command confirmation message 2016-12-26 08:31:24 -05:00
victorwu dd178bbe6a In issue view, remove checking branches and new branch unavailable states 2016-12-26 08:28:15 -05:00
Sean McGivern ee5cc454d7 Merge branch 'ux-guide-copy-discussion' into 'master'
UX Guide: add comment and discussion to copy

See merge request !8206
2016-12-26 12:04:44 +00:00
Sean McGivern 0ebd50ce00 Merge branch 'feature/more-storage-statistics' into 'master'
Add more storage statistics

See merge request !7754
2016-12-26 09:48:30 +00:00
Lin Jen-Shin e60bf0d6c8 Add a test for latest_successful_for 2016-12-26 14:35:12 +08:00
Lin Jen-Shin 655289dd33 Order only for latest_successful_for
Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8286#note_20461082
2016-12-26 14:21:06 +08:00
Sid Sijbrandij 645412b57f Update stack information and remove redundancy 2016-12-24 19:59:03 +00:00
Sid Sijbrandij 311e67299a Update README.md with CI and CD 2016-12-24 19:56:57 +00:00
Achilleas Pipinellis 79ce691d71 Merge branch 'mrchrisw/fix-whitespace-code-block' into 'master'
Fix whitespace in codeblock

See merge request !8291
2016-12-24 12:24:53 +00:00
Grzegorz Bizon 1e38f8ae72 Merge branch 'revert-5c0f2541' into 'master'
Revert "Merge branch 'fix-latest-pipeine-ordering' into 'master'"

See merge request !8302
2016-12-24 08:51:03 +00:00
Grzegorz Bizon 52a259dd84 Revert "Merge branch 'fix-latest-pipeine-ordering' into 'master'"
This reverts merge request !8286
2016-12-24 07:16:30 +00:00
Alfredo Sumaran 1c3c5c2bbd Merge branch 'fix-cycle-analytics-nav' into 'master'
CSS fixes on Cycle Analytics page

See merge request !8300
2016-12-24 01:20:30 +00:00
Alfredo Sumaran 64086f6a76 Remove unnecesary css property 2016-12-23 18:41:08 -05:00
Alfredo Sumaran 1255aa7355 Fix column widths
Fixes text splitting into two lines
2016-12-23 18:40:50 -05:00
Alfredo Sumaran 5935c3fc3a Fix dismiss icon position 2016-12-23 18:38:46 -05:00
Douglas Barbosa Alexandre 21fb690c21 Update CHANGELOG.md for 8.15.1
[ci skip]
2016-12-23 19:27:00 -02:00
Fatih Acet cb819ef75a Merge branch '25930-discussion-actions-overlap-header-text' into 'master'
Fix text overflow

Closes #25930

See merge request !8273
2016-12-23 20:32:32 +00:00
Fatih Acet 406f4cd59e Merge branch '26018-mini-pipeline-hover-cross-broswer' into 'master'
Resolve "Mini pipeline graph dropdown looks weird on Safari and hover does not work on firefox"

Closes #26018, #26004, and #26002

See merge request !8282
2016-12-23 20:27:35 +00:00
Douglas Barbosa Alexandre f791867494 Merge branch 'issue_25887' into 'master'
Do not override incoming webhook channel for mattermost and slack

Closes #25887

See merge request !8270
2016-12-23 19:15:47 +00:00
Rémy Coutable 09af88336d Merge branch 'permit-uploadedfile-scalar' into 'master'
Monkey-patch StrongParameters for ::UploadedFile

Closes gitlab-ee#1451

See merge request !8299
2016-12-23 19:04:21 +00:00
dimitrieh eb25f232fd minor css edits, quicker fade animation for caret, and positioned it slightly down by 1 px 2016-12-23 19:32:15 +01:00
Douglas Barbosa Alexandre d54d546596 Fix rubucop offenses 2016-12-23 15:55:13 -02:00
Jacob Vosmaer f4a2d33a67 Monkey-patch StrongParameters for ::UploadedFile 2016-12-23 18:28:46 +01:00
Douglas Barbosa Alexandre dfef28c920 Rename `opt` to `opts` on ChatNotificationService#execute 2016-12-23 15:19:16 -02:00
Rémy Coutable db396d5b26 Merge branch '25614-transient-failure' into 'master'
Improve spec for resetting incoming email token

Closes #25614

See merge request !8296
2016-12-23 16:52:25 +00:00
Adam Niedzielski 65322905d5 Improve spec for resetting incoming email token 2016-12-23 16:42:44 +01:00
Douwe Maan 5866f7b30e Merge branch 'process-commit-worker-large-batches' into 'master'
Improve ProcessCommitWorker for large push payloads

Closes #25827

See merge request !8267
2016-12-23 14:51:20 +00:00
Rémy Coutable 518a0144b1 Merge branch 'zj-fix-issue-search-chat-command' into 'master'
Fix errorcode 500 on slash commands

Closes #26013

See merge request !8285
2016-12-23 14:31:48 +00:00
Kushal Pandya b5d6d107af Changelog entry for MR !8295 2016-12-23 19:09:09 +05:30
Kushal Pandya c21df973b0 Hide Scroll Top for failed build 2016-12-23 18:55:49 +05:30
Douglas Barbosa Alexandre 89b67d6d5a Merge branch 'fix/changelog' into 'master'
[ci skip] Fix wrong release date for 8.15.0 on CHANGELOG

See merge request !8294
2016-12-23 13:23:44 +00:00
Nur Rony 56fb1beb4e adds changelog 2016-12-23 19:13:59 +06:00
Douglas Barbosa Alexandre b75cec0d1b [ci skip] Fix wrong release date for 8.15.0 on CHANGELOG 2016-12-23 11:12:30 -02:00
Yorick Peterse 89d3ef38cc
Schedule at most 100 commits
When processing push payloads we now schedule at most the 100 most
recent commits, instead of all commits that were in a payload. This
prevents one from overloading the system by pushing thousands if not
millions of commits in a single go.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/25827
2016-12-23 14:05:00 +01:00
Nur Rony 3f6edaeae8 fixes confedential warning alignment on comment box 2016-12-23 19:04:00 +06:00
Filipa Lacerda 5507c7c66b Fix line breaking in nodes of the pipeline graph in firefox
Adds MR ID to CHANGELOG entry
2016-12-23 12:44:26 +00:00
Grzegorz Bizon 5c0f25410c Merge branch 'fix-latest-pipeine-ordering' into 'master'
Fix code that selects latest pipelines

Closes #25993 and #26031

See merge request !8286
2016-12-23 12:28:54 +00:00
Filipa Lacerda 8f490cbe0e Fix eslint errors 2016-12-23 12:06:45 +00:00