adfcd57296
Bump omniauth-saml to 1.4.1
...
Updates a vulnerable `ruby-saml` dependency.
- 9853651b96https://github.com/onelogin/ruby-saml/pull/247
2015-08-14 22:24:21 -04:00
87ec6ae3a5
Merge branch 'fix/redirect_after_sign_in' into 'master'
...
Fix redirection after sign in when using auto_sign_in_with_provider
Logic for redirect path moved to a filter. This allows it to run properly when the auto_sign_in_with_provider filter takes control.
See merge request !1146
2015-08-14 19:45:01 +00:00
494afae08d
Merge branch 'mysql_insecure_password_warnings' into 'master'
...
Workaround the insecure password warnings emitted by MySQL 5.6
When using MySQL 5.6, the following output is emitted every time a backup is created, even with CRON=1.
```
Warning: Using a password on the command line interface can be insecure.
```
This fix works around that by sending the password via the [`MYSQL_PWD`](http://dev.mysql.com/doc/refman/5.6/en/environment-variables.html ) environment variable.
See merge request !1139
2015-08-14 17:12:57 +00:00
317b7ad3e8
Merge pull request #9528 from revaret/Fixed_alignment_issue
...
Fix for #9527
2015-08-14 09:12:34 -07:00
a608e45e6b
Remove unnecessary file
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-14 17:56:36 +02:00
9ea37cda3f
merge with support of pre-receive and post-receive hooks
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-14 17:52:49 +02:00
d416a9d624
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-08-14 08:51:49 -07:00
5824766252
Merge pull request #9562 from bladealslayer/fix/flowdock-gem-update
...
Update Flowdock integration to support new Flowdock API
2015-08-14 08:34:51 -07:00
88ab815b38
Update Flowdock integration to support new Flowdock API
...
Requires that users create a Git source in their flows and update the configured token to the Git source token. The old flow tokens can't be used.
2015-08-14 16:45:23 +02:00
f4149bcddc
Refactor how repository makes commit with pre/post receive hooks
2015-08-14 16:23:40 +02:00
6e808fc222
Clear cache to prevent listing deleted branches after MR removes source branch
...
Closes #2272
2015-08-14 07:09:25 -07:00
4e4866f255
Refactor pre/post receive commit services into one class
2015-08-14 16:04:17 +02:00
bacad39ef9
Make sure target has not changed during pre-receive hook
2015-08-14 15:22:48 +02:00
9649f9387a
Fix tests for web editor
2015-08-14 15:08:31 +02:00
9011a32234
Disable pre-receive check in test env
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-14 13:27:51 +02:00
3483024d93
Merge branch 'disable-internal-tracker-when-external-in-use' into 'master'
...
Disable internal issue tracker if external tracker in use
### What does this MR do?
This MR disables routes to the internal issue tracker if an external issue tracker (e.g. Redmine) is in use. A 404 page is returned if a user attempts to access any of the issue routes.
### Why was this MR needed?
Enabling the external issue tracker would still keep the internal one active, which would lead to odd behavior where users could create issues but not close them.
### What are the relevant issue numbers?
Closes #2006
See merge request !993
2015-08-14 11:01:43 +00:00
b6bdd650a5
Merge branch 'improve-readability' into 'master'
...
Set max-width for README, issue and merge request description
It allows easier text reading on big screens
### Problem
Text is hard to read on wide screens:
### Solution
Set max-width to content. Screenshots:
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !1161
2015-08-14 10:55:08 +00:00
8b9c129016
Add CHANGELOG item
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-14 11:35:48 +02:00
ec910c3307
Set max-width for README, issue and merge request description
...
It allows easier text reading on big screens
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-14 11:29:45 +02:00
e8889b154e
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-08-14 11:20:39 +02:00
5f2562dfc5
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-08-14 11:20:18 +02:00
b665833370
Merge branch 'respect_filters' into 'master'
...
Fix: User search feature in admin area does not respect filters
https://dev.gitlab.org/gitlab/gitlabhq/issues/2482
See merge request !1155
2015-08-14 08:35:16 +00:00
e58e75aa88
Fix: User search feature in admin area does not respect filters
2015-08-13 17:51:20 +03:00
22eddffd41
Fixed #9527
2015-08-13 19:48:10 +05:30
f6f58cfb1f
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-08-13 07:17:21 -07:00
a8e4c391cd
Merge pull request #9556 from pupaxxo/patch-3
...
Fix changelog
2015-08-13 07:16:49 -07:00
c8614cbbe7
Capture pre-receive exception
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-13 14:29:13 +02:00
d891b23e62
Merge branch 'add-image' into 'master'
...
New doc about how to add an image in GitLab Basics
See merge request !1918
2015-08-13 12:05:16 +00:00
f34c0b6a12
Merge pull request #9557 from pupaxxo/patch-4
...
Time for 7.14.0.pre
2015-08-13 13:46:51 +02:00
00a33d67aa
Merge branch 'improve-hipchat-service-test' into 'master'
...
Provide more feedback what went wrong if HipChat service failed test
This MR adds support for displaying the error message during HipChat service test. Before an Error 500 would be displayed with no helpful remarks.
Screenshot:
Issue gitlab-com/support-forum#213
See merge request !1144
2015-08-13 11:43:44 +00:00
b3b0a1890e
Time for 7.14.0.pre
2015-08-13 13:25:54 +02:00
34690142bf
Implement commit transaction with pre-receive and post-receive hooks for web editor
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-13 12:57:24 +02:00
167ab75365
Merge branch 'bring-clonebar-back' into 'master'
...
Bring clone bar back
Screenshot:
See discussion in !1080
See merge request !1147
2015-08-13 10:56:01 +00:00
3a84b45b51
Merge branch 'update_changelog' into 'master'
...
Update changelog
See merge request !1153
2015-08-13 09:50:48 +00:00
fc7e63236e
update chnagelog
2015-08-13 12:49:26 +03:00
b70988b4d6
Fix changelog
2015-08-13 11:25:10 +02:00
907860ed3d
Remove the `gfm_with_options` helper
...
It was redundant because `gfm` also took options.
2015-08-12 23:32:16 -04:00
7d1c06793e
Merge branch 'note-query-information' into 'master'
...
Note query information
See merge request !1149
2015-08-12 23:36:29 +00:00
e956d116c5
Merge branch 'more-markdown-extensions' into 'master'
...
markup_helper: detect .mkd and .mkdn as markdown
See merge request !1148
2015-08-12 23:18:05 +00:00
95f8f7c729
api: add 'system', 'upvote', and 'downvote' fields to note queries
...
This reverts commit 4c586dc7c2
2015-08-12 17:02:33 -04:00
518aa7dca6
Bring clone bar back
...
See discussion in !1080
2015-08-12 14:00:59 -07:00
013260e057
markup_helper: detect .mkd and .mkdn as markdown
2015-08-12 15:29:15 -04:00
6a82c9f018
Merge branch 'mr-merge-manually-2' into 'master'
...
Move merge manually text below merge widget
Replace !1121
Screenshot:
#### Before
#### After
See merge request !1141
2015-08-12 16:06:16 +00:00
fb6e8008c4
Fix redirection after sign in when using auto_sign_in_with_provider
...
Logic for redirect path moved to a filter.
2015-08-12 17:31:35 +02:00
7430e7b5fc
Workaround the warnings emitted by MySQL 5.6 regarding password on the
...
command line.
2015-08-12 07:51:24 -07:00
2379057002
Provide more feedback what went wrong if HipChat service failed test
...
Issue gitlab-com/support-forum#213
2015-08-12 07:31:25 -07:00
cd579cb2ff
Merge pull request #9545 from Baldinof/add_merged_label
...
Add merged label on branches page
2015-08-12 14:30:42 +02:00
235acd2226
fixed text
2015-08-11 19:18:20 -07:00
1df163866f
fixed text
2015-08-11 19:16:13 -07:00
c36adb98aa
Fix bug where backslashes in inline diffs could be dropped
...
Closes #2253
2015-08-11 18:39:27 -07:00
Robert Speicher
Stan Hu
Dmitriy Zaporozhets
Boyan Tabakov
Valery Sizov
ranjith
Job van der Voort
Robert Schilling
Andrea Ruggiero
Valery Sizov
Ben Boeckel
Alex Lossent
Ted Strzalkowski
karen Carias
