501be36c2e
Just use the repo. Not sure why master could pass
...
It keeps giving me no repo error from setting up autocrlf,
which shouldn't have anything to do with this merge request.
2017-08-11 20:10:43 +08:00
e04c1ae7c7
Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-better
...
* upstream/master: (62 commits)
Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb.
Docs: update user docs index
Fix minor typos in views
Fix Layout/SpaceBeforeBlockBraces violation in bin/changelog_spec
Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4'
Merge branch 'import-symlinks-9-3' into 'security-9-3'
Fix wrong method call on prometheus histogram
Document new all-in-one Helm chart - docs
Fix 404 on link path
Fix line numbers not matching up to code in code viewer.
Hide overflow-x on collapsed sidebar
removed global use of breakpoint checker
Increase performance of the breakpoint size checker
Filter sensitive query string parameters from NGINX access logs
Added a template for database changes
Render new issue link in failed job as a regular link instead of a UJS one
Include RE2 in the upgrade docs
Remove affix plugin from issuable sidebar with new navigation
Fix linter error
alternative route for download archive
...
2017-08-11 19:15:35 +08:00
ae7c52a060
Fix more tests
2017-08-11 17:54:34 +08:00
41a5adca75
Don't try to create diffs if one of the branch is missing
...
Also fix a few tests
2017-08-10 23:53:55 +08:00
412db1874f
Fix some tests and report the error message
2017-08-09 21:41:45 +08:00
c946ee1282
Enable the Layout/SpaceBeforeBlockBraces cop
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-09 11:52:22 +02:00
72a7b30c9f
Change all `:empty_project` to `:project`
2017-08-02 17:47:31 -04:00
e43bda0ebb
Merge branch 'dz-update-shoulda' into 'master'
...
Update shoulda-matchers gem to 3.1.2
See merge request !13040
2017-07-25 08:08:26 +00:00
eafb03cfd5
Remove unnecessary set_flash.now from controller specs
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2017-07-24 15:21:16 +03:00
2fa22a0729
Associate Issues tab only with internal issues tracker
2017-07-24 08:10:14 +02:00
c6e979587a
Merge branch '34930-fix-edited-by' into 'master'
...
Fix issue detail if user who last edited an issue was deleted
Closes #34930
See merge request !12933
2017-07-19 16:19:32 +00:00
a9d940bffc
Use Ghost user when edited_by, merged_by deleted
2017-07-19 11:35:17 +02:00
3715c1cfb5
Fix external issue trackers redirect
2017-07-18 11:44:47 -03:00
fe13f11041
Create and use project path helpers that only need a project, no namespace
2017-07-05 11:11:59 -05:00
0430b76441
Enable Style/DotPosition Rubocop 👮
2017-06-21 13:48:12 +00:00
ea090291bb
Rename "Slash commands" to "Quick actions"
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27070
Deprecate "chat commands" in favor of "slash commands"
We looked for things like:
- `slash commmand`
- `slash_command`
- `slash-command`
- `SlashCommand`
2017-06-15 09:01:56 -05:00
a6ec5121f0
Correct RSpec/SingleLineHook cop offenses
2017-06-14 13:18:56 -05:00
a7e82cbd61
Make sure reCAPTCHA configuration is loaded when spam checks are initiated
...
Previously it was possible when an issue was updated and Akismet flagged it as spam
that the reCAPTCHA configuration was not loaded.
Closes #33532
2017-06-10 03:43:02 -07:00
04178d72b5
fixed move issue specs
...
[ci skip]
2017-05-25 12:50:11 +01:00
49ded5c1fa
Bugfix: don't redirect to JSON endpoints after sign in
2017-05-19 13:37:40 -05:00
387c4b2c21
Backport of multiple_assignees_feature [ci skip]
2017-05-04 17:11:53 +03:00
b64a37c4ed
Allow to create new branch and empty WIP merge request from issue page
2017-05-04 08:09:21 +00:00
9cee280d70
Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion
2017-04-06 13:47:52 +01:00
b80653bb6a
Merge branch 'open-redirect-host-fix' into 'security'
...
Fix for three open redirect vulns using redirect_to url_for(params.merge)))
See merge request !2082
2017-04-05 21:06:58 -07:00
08bbb9fce6
Add option to start a new discussion on an MR
2017-04-05 17:44:14 +01:00
97941d2cf5
Display flash message to unauthenticated user when creating new issue
2017-03-25 09:32:26 -04:00
86ef67eee5
Present ajax call errors when failing to update an Issue
2017-03-21 14:20:15 -03:00
4ea85da9fb
Merge remote-tracking branch 'dev/master'
2017-03-20 18:55:40 -07:00
7be39a894b
Merge branch 'render-json-leak' into 'security'
...
fix for render json include leaks
See merge request !2074
2017-03-20 18:54:17 -07:00
85759f2c79
Merge branch '20204-new-issue-button-redirects-you-to-create-a-new-issue-after-logging-in' into 'master'
...
Redirect to signin when New Issue for not logged in
Closes #20204
See merge request !9743
2017-03-20 18:51:44 +00:00
aea78ded34
Redirect to signin when New Issue for not logged in
2017-03-20 10:43:54 -04:00
ea70a0d674
Rename variable
...
merge_request_for_resolving_discussions ->
merge_request_to_resolve_discussions_of
2017-03-13 08:27:52 +01:00
f8b5fef9f7
Separate flash messages for resolving one or multiple discussions
2017-03-13 08:27:52 +01:00
6f9304e030
Add a flash messages when an issue resolving discussions is created
2017-03-13 08:27:51 +01:00
f86928953d
Always require MR-iid for resolving discussions
...
And deduplicate the finding of MR's & discussions. Now the searching
is done in the service, istead of the controller & the API.
2017-03-13 08:27:51 +01:00
0267b83898
Delegate a single discussion to a new issue
...
Delegate a discussion in a merge request into a new issue.
The discussion wil be marked as resolved and a system note will be
added linking to the newly created issue.
2017-03-13 08:27:51 +01:00
dfd15596a4
Merge branch 'issue_24815' into 'master'
...
fix ERR_CONTENT_LENGTH_MISMATCH on task checkboxes
See merge request !8567
2017-02-27 14:14:20 +00:00
0d000d351c
Fix issuable stale object error handler for js when updating tasklists
2017-02-24 15:13:42 -03:00
ad640bc5f9
Use Namespace#full_path instead of #path where appropriate
2017-02-23 17:55:01 -06:00
2ace39f242
Spam check and reCAPTCHA improvements
2017-02-21 13:32:49 -03:00
0b14b654b6
Gather issuable metadata to avoid n+ queries on index view
2017-02-09 17:40:37 -02:00
3d2954e457
Use reCaptcha when an issue identified as spam
2017-02-07 12:56:20 +01:00
4642ca6686
Use `empty_project` where possible in controller specs
2017-01-25 17:14:38 -05:00
17196a2ff3
Backport backend work for time tracking.
2017-01-15 11:10:04 -05:00
d7a2e92ca0
applies url_for so that we dont lose filters when redirecting
2016-12-23 15:09:34 +00:00
805bbe8893
adds specs for respective behaviour
2016-12-21 23:53:24 +00:00
1123057ab7
Feature: delegate all open discussions to Issue
...
When a merge request can only be merged when all discussions are
resolved. This feature allows to easily delegate those discussions to a
new issue, while marking them as resolved in the merge request.
The user is presented with a new issue, prepared with mentions of all
unresolved discussions, including the first unresolved note of the
discussion, time and link to the note.
When the issue is created, the discussions in the merge request will get
a system note directing the user to the newly created issue.
2016-12-05 20:55:45 +01:00
d86c666662
Refresh todos count cache when an Issue/MR is deleted
2016-09-08 15:50:07 -03:00
ace38e8397
Fix external issue tracker "Issues" link leading to 404s
...
a70431f874Closes #21252 , #21402
2016-08-25 14:53:17 -07:00
5994c11910
Further refactor and syntax fixes.
2016-08-15 17:20:57 -05:00
Lin Jen-Shin
Rémy Coutable
Robert Speicher
Dmitriy Zaporozhets
Jarka Kadlecova
Sean McGivern
Felipe Artur
Douwe Maan
Grzegorz Bizon
Eric Eastwood
Stan Hu
Phil Hughes
Ruben Davila
Valery Sizov
Alfredo Sumaran
Luke "Jared" Bennett
Sean McGivern
Sam Rose
Oswaldo Ferreira
DJ Mountney
DJ Mountney
Bob Van Landuyt
Bob Van Landuyt
Tiago Botelho
Douglas Barbosa Alexandre
Patricio Cano