summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
Commit message (Expand)AuthorAgeFilesLines
* Add MockCiService integrationmock-ci-serviceEric Eastwood2017-02-241-0/+1
* Revert "Enable Style/DotPosition"Douwe Maan2017-02-232-5/+5
* Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-234-9/+9
* Fix new offensesDouwe Maan2017-02-231-1/+1
* Prefer leading style for Style/DotPositionDouwe Maan2017-02-234-9/+9
* Fix code for copsDouwe Maan2017-02-231-7/+8
* Enable Style/ConditionalAssignmentDouwe Maan2017-02-231-3/+3
* Enable Style/MutableConstantDouwe Maan2017-02-231-2/+2
* Enable Style/DotPositionDouwe Maan2017-02-232-5/+5
* Merge branch 'add_mr_info_to_issues_list' into 'master'Sean McGivern2017-02-223-8/+16
|\
| * Refactored count_for_collection() for using pluck instead of selectblackst0ne2017-02-211-2/+2
| * Merge remote-tracking branch 'upstream/master' into add_mr_info_to_issues_listblackst0ne2017-02-212-12/+25
| |\
| * | Added second parameter to @issuable_meta_data variablesblackst0ne2017-02-172-2/+2
| * | Add merge request count to each issue on issues listblackst0ne2017-02-171-6/+14
* | | Spam check and reCAPTCHA improvements28093-snippet-and-issue-spam-check-on-editOswaldo Ferreira2017-02-211-6/+24
| |/ |/|
* | Merge branch 'dm-fix-editing-files-on-forks-quick' into 'master' Robert Speicher2017-02-201-12/+4
|\ \
| * | Fix issue where files on a fork could not be editedDouwe Maan2017-02-171-12/+4
| |/
* | Merge branch '21240_snippets_line_ending' into 'master' Sean McGivern2017-02-201-0/+21
|\ \ | |/ |/|
| * Download snippets with LF line-endings by defaultJarka Kadlecova2017-02-201-0/+21
* | Gather issuable metadata to avoid n+ queries on index viewissue_25900_2Felipe Artur2017-02-093-0/+28
|/
* Use reCaptcha when an issue identified as spamJarka Kadlecova2017-02-071-0/+18
* Merge branch 'fix-git-hooks-when-creating-file' into 'master' Douwe Maan2017-02-021-17/+36
|\
| * Make sure different project gets a merge requestLin Jen-Shin2017-01-261-2/+4
| * @tree_edit_project is no longer usedLin Jen-Shin2017-01-261-4/+1
| * Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2017-01-263-39/+64
| |\
| * | Rename from base to start because base could mean merge baseLin Jen-Shin2017-01-061-3/+3
| * | Detect if we really want a new merge request properlyLin Jen-Shin2017-01-061-2/+5
| * | Properly fix the edge case!Lin Jen-Shin2017-01-061-2/+15
| * | Rename source to base to avoid confusion from MRLin Jen-Shin2017-01-061-3/+3
| * | Don't set invalid @mr_source_branch when create_merge_request?Lin Jen-Shin2017-01-061-6/+3
| * | Fix for initial commit and remove unneeded argsLin Jen-Shin2017-01-061-3/+9
| * | Just trust set_commit_variables to set everything!Lin Jen-Shin2017-01-061-3/+1
| * | Merge request terms are reversed for GitOperationServiceLin Jen-Shin2017-01-051-4/+4
| * | I think I am really confused, should be @tree_edit_projectLin Jen-Shin2017-01-051-1/+1
| * | Indent the way rubocop likesLin Jen-Shin2017-01-051-2/+2
| * | Merge branch 'master' into fix-git-hooks-when-creating-fileLin Jen-Shin2017-01-043-2/+21
| |\ \
| * | | Try to use those @mr variables for full correctnessLin Jen-Shin2016-12-141-4/+6
| * | | Fix source_project and also pass source_projectLin Jen-Shin2016-12-141-2/+2
| * | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-101-4/+2
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-081-1/+6
| |\ \ \ \
| * | | | | We still need it for empty repo for web UI!Lin Jen-Shin2016-12-081-1/+2
| * | | | | We probably don't need this anymore, not sure whyLin Jen-Shin2016-12-081-2/+1
| * | | | | Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-12-033-4/+123
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creati...Lin Jen-Shin2016-11-226-6/+15
| |\ \ \ \ \ \
| * | | | | | | Try if branch_exists? would work, feedback:Lin Jen-Shin2016-11-151-1/+1
| * | | | | | | @ref might not existLin Jen-Shin2016-11-151-1/+1
| * | | | | | | Don't pass source_branch if it doesn't existLin Jen-Shin2016-11-151-1/+2
* | | | | | | | Check public snippets for spamSean McGivern2017-02-021-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Fix other spec failuresJames Lopez2017-01-171-2/+2
* | | | | | | more refactoring and fixing old specsJames Lopez2017-01-171-0/+4