delta/gitlab/gitlab-ce.git/app/models, branch tutorials_git_tricks gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'disable-remove-source-branch' into 'master' 2016-02-04T11:56:58+00:00 Douwe Maan douwe@gitlab.com 2016-02-04T11:56:58+00:00 b5befc734be55a4a7a07519baf03e0ba29c0f8c5 Hide remove source branch button when new commit is added to branch Fixes #3339 This MR hides the 'Remove source branch' button when a new commit is added to the source branch /cc @DouweM See merge request !2701 

Hide remove source branch button when new commit is added to branch

Fixes #3339

This MR hides the 'Remove source branch' button when a new commit is added to the source branch

/cc @DouweM

See merge request !2701
 Hide remove source branch button when new commit is added to branch 2016-02-04T10:56:23+00:00 Zeger-Jan van de Weg mail@zjvandeweg.nl 2016-02-04T10:51:12+00:00 c6e0228ca9937b10ad8e2620501d4fe221108d9a Fixes #3339 This MR hides the 'Remove source branch' button when a new commit is added to the source branch 
Fixes #3339

This MR hides the 'Remove source branch' button when a new commit is added to the source branch
Merge branch 'wipMergeSpacing' into 'master' 2016-02-04T09:49:54+00:00 Douwe Maan douwe@gitlab.com 2016-02-04T09:49:54+00:00 a1fa973123796ce27559063a644f093539107a7f No space required after WIP identifier Fixes #2426 Currently, the WIP: (or any other variation) prefix of a merge request title must include a trailing space for it to be recognized as a work in progress and prevent merging. To resolve this, I added an or pattern to the regexp to look for any one of the three possible delimiters ':', ']', or ' '. This way the trailing space isn't required but it still won't mark any titles beginning with wip as work in progress (e.g. "Wipwap"). See merge request !1876 

No space required after WIP identifier

Fixes #2426 

Currently, the WIP: (or any other variation) prefix of a merge request title must include a trailing space for it to be recognized as a work in progress and prevent merging. 
To resolve this, I added an or pattern to the regexp to look for any one of the three possible delimiters ':', ']', or ' '. This way the trailing space isn't required but it still won't mark any titles beginning with wip as work in progress (e.g. "Wipwap").

See merge request !1876
 Merge branch 'support-akismet' into 'master' 2016-02-03T01:26:30+00:00 Robert Speicher robert@gitlab.com 2016-02-03T01:26:30+00:00 8a85906a74aff295074c79619d491bea9c947e05 Support Akismet spam checking for creation of issues via API Currently any spam detected by Akismet for non-members via API will be logged in a separate table in the admin page. Closes #5612 See merge request !2266 

Support Akismet spam checking for creation of issues via API

Currently any spam detected by Akismet for non-members via API will
be logged in a separate table in the admin page.

Closes #5612

See merge request !2266
 Merge remote-tracking branch 'origin/master' into lazy-blobs 2016-02-02T14:04:54+00:00 Jacob Vosmaer contact@jacobvosmaer.nl 2016-02-02T14:04:54+00:00 d3affe8bca5f5944c6819be1261cc4da7a2c9420 






Use begin/end instead of defined?
2016-02-02T13:35:09+00:00

Jacob Vosmaer
contact@jacobvosmaer.nl

2016-02-02T13:35:09+00:00

0a4db90d36870211df2dc1e606b01602666706c8












Refactor Admin::SpamLogsController to block user before destroying
2016-02-02T13:25:44+00:00

Douglas Barbosa Alexandre
dbalexandre@gmail.com

2016-01-26T21:20:01+00:00

718b1dddfe8d7422e8de8b2fbbd8357fc1c3b5e4












Fix typo on User model
2016-02-02T13:25:44+00:00

Douglas Barbosa Alexandre
dbalexandre@gmail.com

2016-01-26T19:55:33+00:00

e38a1fc83ee7a9fb04fe370204f0094723890f00












Use truncate helper on spam logs list
2016-02-02T13:25:44+00:00

Douglas Barbosa Alexandre
dbalexandre@gmail.com

2016-01-26T18:59:23+00:00

64c9768bd6916edfc1e43907ca5e976524b8d51b












Support Akismet spam checking for creation of issues via API
2016-02-02T13:25:44+00:00

Stan Hu
stanhu@gmail.com

2016-01-09T19:30:34+00:00

d20e75a8d80c2828336cd22897ea6868d666f8a5

Currently any spam detected by Akismet by non-members via API will be logged
in a separate table in the admin page.

Closes #5612





Currently any spam detected by Akismet by non-members via API will be logged
in a separate table in the admin page.

Closes #5612