| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| |
|
|
| |
Closes #2340
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
and request them each session. Pass these tokens to the project import data.
This prevents the need to encrypt these tokens and clear them in case they
expire or get revoked.
For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get
an Error 500 with no way to recover:
```
Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000
Processing by Import::BitbucketController#status as HTML
Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms)
NameError (uninitialized constant Import::BitbucketController::Unauthorized):
app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions'
app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions'
app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized'
```
Closes #1871
|
| |
|
|
|
|
|
|
|
|
|
| |
non-default branches.
I also revamped the tests on "closing reference commits" (= "Fixes #xxxx" for example).
Now, there are two different contexts:
- when the commits with "closing reference" are pushed to the default branch,
- when the commits with "closing reference" are pushed to a non-default branch.
Closes gitlab-org/gitlab-ce#2190.
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Reply by email
Fixes #1360.
It's far from done, but _it works_.
See merge request !1173
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| | |\ |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix bug preventing invite by e-mail
This was broken in 70f5291808 as a result of introducing the ability to filter by current user.
Closes #2320
See merge request !1181
|
| | | |/
| |/|
| | |
| | |
| | |
| | | |
This was broken in 70f5291808 as a result of introducing the ability to filter by current user.
Closes #2320
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Remove trailing HTML entities from non-Rinku autolinks as well.
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2550
See merge request !1179
|
| | | | | |
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Only show recent push event if the branch still exists or a recent merge request has not been created
Closes #2277
See merge request !1167
|
| | | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
request has not been created
Closes #2277
|
| |\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Case-insensitive search for comments
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !1174
|
| | |/ /
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| |/ /
| |
| |
| | |
Closes #2305
|
| |\ \
| |/
|/|
| | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | |\
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
| | | |
| | |
| | |
| | |
| | | |
This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing
changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix infinite loop when SAML was incorrectly configured.
See merge request !1170
|
| | | |/
| |/| |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Clear cache to prevent listing deleted branches after MR removes source branch
Closes #2272
See merge request !1160
|
| | | | |
| | | |
| | | |
| | | | |
Closes #2272
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Remove the `gfm_with_options` helper
It was redundant because `gfm` also took options.
See merge request !1152
|
| | | | | |
| | | | |
| | | | |
| | | | | |
It was redundant because `gfm` also took options.
|
| |\ \ \ \ \
| |_|_|/ /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | |_|/
| |/| |
| | | |
| | | | |
Closes #2253
|
| |\ \ \ \ |
|
| | |\ \ \ \
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Closes #2006
|
| |/ / / /
| | | |
| | | |
| | | | |
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.
|
| |\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
