0a5b005da1
Fix blame view line groupings
...
Closes #2305
2015-08-20 01:27:29 -07:00
72a425fa66
Merge branch 'remove-satellites'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-19 09:52:39 +02:00
204914983a
Merge branch 'fix-authhash-infinite-loop' into 'master'
...
Fix infinite loop when SAML was incorrectly configured.
See merge request !1170
2015-08-18 15:56:30 +00:00
798f2fe19f
Merge branch 'mr-source-branch-clear-cache' into 'master'
...
Clear cache to prevent listing deleted branches after MR removes source branch
Closes #2272
See merge request !1160
2015-08-18 13:16:46 +00:00
262c6f11fe
Merge branch 'rs-remove-gfm_with_options' into 'master'
...
Remove the `gfm_with_options` helper
It was redundant because `gfm` also took options.
See merge request !1152
2015-08-17 23:42:29 +00:00
c16b1651f5
Fix infinite loop when SAML was incorrectly configured.
2015-08-17 16:39:22 -07:00
c9920c422d
Merge branch 'fix-backslashes-inline-diff' into 'master'
...
Fix bug where backslashes in inline diffs could be dropped
This MR fixes a bug in inline diff generation causing backslashes to be dropped. For example, the input:
```
input.to_s.sub(/[\r\n].+/,'').sub(/\\[rn].+/, '').strip
```
The second backslash is dropped in the second `sub` statement:
With this fix, it looks like:
Closes #2253
See merge request !1143
2015-08-17 23:33:36 +00:00
4a0fa27017
Merge branch 'master' into remove-satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-17 11:41:53 +02:00
d416a9d624
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-08-14 08:51:49 -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
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
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
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
907860ed3d
Remove the `gfm_with_options` helper
...
It was redundant because `gfm` also took options.
2015-08-12 23:32:16 -04:00
013260e057
markup_helper: detect .mkd and .mkdn as markdown
2015-08-12 15:29:15 -04: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
c36adb98aa
Fix bug where backslashes in inline diffs could be dropped
...
Closes #2253
2015-08-11 18:39:27 -07:00
8adf6ba8f5
Add merged label on branches page
2015-08-11 23:00:46 +02:00
3e259ea8bc
Revert "Merge branch 'revert-satellites' into 'master'
"
...
This reverts commit 5daf44b7c82f706fbd23
2015-08-11 14:33:31 +02:00
5daf44b7c8
Merge branch 'revert-satellites' into 'master'
...
Revert satellites
Return satellites to master for 7.14
We remove satellites in next release (8.0)
See merge request !1136
2015-08-11 12:27:38 +00:00
3a63c00505
Fix file api tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11 13:47:37 +02:00
9d029a05f1
Revert "Merge branch 'web-editor-rugged' into 'master'"
...
This reverts commit 5a1aa49b55a675bea2c1
2015-08-11 13:04:38 +02:00
32046983ad
Revert "Merge branch 'refactor-can-be-merge' into 'master'"
...
This reverts commit 459e6d3467804168e1de
2015-08-11 10:48:02 +02:00
9f10943c1a
Revert "Merge branch 'drop-satellites'"
...
This reverts commit 957e849f416b9dbe9f5a
2015-08-11 10:28:42 +02:00
6e7bf50ba6
Merge branch 'fix-diff-highlighting' into 'master'
...
Fix diff syntax highlighting
### What does this MR do?
This MR fixes a syntax highlighting issue that that manifested itself when a user tried the following:
```
+aaa
+bbb
ccc
```
However, a regression in 0abe98f0https://gitlab.com/stanhu/gitlab-ce/uploads/a16515499d5e3fd9737370d89c73f671/image.png )
Instead of this:
This bug occurred because of some error in the logic of handling new lines in the content. Refactored HTML parser to avoid duplication of newline parsing.
### What are the relevant issue numbers?
Closes #2235
See merge request !1126
2015-08-10 15:55:44 +00:00
15d5dfdb33
Fix diff syntax highlighting
...
Refactored HTML parser to avoid duplication of newline parsing.
Closes #2235
2015-08-10 08:07:26 -07:00
39bda5d05e
Merge branch 'disable-autocrlf-for-binary-files' into 'master'
...
Fix corrupted binary files when using API files endpoint
Closes #2219
See merge request !1123
2015-08-10 14:04:07 +00:00
fb6f8d9198
Merge branch 'rs-reference-data-attrs' into 'master'
...
Add `data-[type]-id` attribute to reference links
This is to let us redact them later in another filter.
See merge request !1110
2015-08-10 00:07:56 +00:00
c5648de230
Fix corrupted binary files when using API files endpoint
...
Add CHANGELOG for gitlab_git 7.2.9 updates
Closes #2219
2015-08-09 15:23:22 -07:00
32e63ba7a1
Add `data-[type]-id` attribute to reference links
...
This is to let us redact them later in another filter.
2015-08-08 16:43:29 -04:00
a71bed53e0
Merge branch 'merge-notifs' into 'master'
...
See merge request !1077
2015-08-07 18:47:02 -04:00
0c31701932
Merge branch 'bitbucket-show-incompatible' into 'master'
...
Show incompatible projects in Bitbucket import status
### What does this MR do?
This MR displays incompatible Bitbucket projects (e.g. SVN, hg) in the status table.
### Why was this MR needed?
Users are confused when they don't see projects show up. The import list should show incompatible projects as we do for Google Code to make it more obvious to the user what is happening. (See !586 and 9c76a6fahttps://gitlab.com/gitlab-org/gitlab-ce/uploads/264b080114c809c4a3a79580594af8b2/image.png )
### What are the relevant issue numbers?
#1871
See merge request !1114
2015-08-07 14:46:05 +00:00
d7accda1ae
Show incompatible projects in Bitbucket import status
...
See #1871
2015-08-07 07:07:08 -07:00
fb6dc1f07d
Add `Group#add_*` convenience methods
...
Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
2015-08-07 00:20:02 -04:00
c5eb2977d7
Merge branch 'add-current-user-to-autocomplete' into 'master'
...
Always add current user to autocomplete controller to support filter by "Me"
### What does this MR do?
This MR always adds the current user to the autocomplete list of users.
### Why was this MR needed?
Normally only the members from a team or the group are shown in the autocomplete list. However, this prevents a user from filtering issues belong to him/her if the user does not belong directly to either. To make this filtering more usable, we can be sure to add the current user to the list, which the JavaScript code will move to the top of the list.
### What are the relevant issue numbers?
Partial fix #2202
See merge request !1100
2015-08-06 16:10:38 +00:00
dcb0bf0df5
Merge branch 'report-spam'
2015-08-06 18:07:36 +02:00
674e1c7458
Fix spec
2015-08-06 17:15:37 +02:00
cba7f20dc8
Allow users to send abuse reports
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-06 14:03:27 +02:00
4f24eb2aa6
Merge branch 'master' into merge-notifs
2015-08-06 12:16:36 +02:00
c6cbee846c
Merge branch 'remove-email-from-published-keys' into 'master'
...
Only publish ssh key-type and key
Now when requesting my keys; my emailadres is exposed. [My keys](https://gitlab.com/zj.keys )
To prevent harvesting only key-type and the key itself are displayed instead of all data supplied when uploaded.
See merge request !850
2015-08-06 09:05:15 +00:00
863f61343a
Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'
...
Fix errors deleting, creating, and viewing graphs using branches with encoded slashes
* Closes #1804
* Closes #1359
See merge request !1084
2015-08-06 08:29:18 +00:00
70f5291808
Always add current user to autocomplete controller to support filter by "Me"
...
Partial fix #2202
2015-08-06 00:46:14 -07:00
957e849f41
Merge branch 'drop-satellites'
2015-08-05 15:40:14 +02:00
764124c380
Merge branch 'revert_touch' into 'master'
...
Revert "Update noteable after a new note is added"
This reverts commit fbdaf0e2a5https://gitlab.com/gitlab-org/gitlab-ce/issues/2027
See merge request !1094
2015-08-05 09:57:27 +00:00
ab8c71de4e
Fix merge request creation without branch selected
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-05 11:03:41 +02:00
6353ca9ae8
Revert "Update noteable after a new note is added"
...
This reverts commit fbdaf0e2a5
2015-08-05 12:00:12 +03:00
0c1ccda43f
Add "Confirm user" button in user admin page
...
Closes #2116
Closes https://github.com/gitlabhq/gitlabhq/issues/9502
2015-08-05 00:35:53 -07:00
Stan Hu
Dmitriy Zaporozhets
Robert Speicher
Douwe Maan
Boyan Tabakov
Robert Speicher
Ben Boeckel
Florent (HP)
Sytse Sijbrandij
Valery Sizov
