summaryrefslogtreecommitdiff
path: root/spec/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issue_12758' into 'master' Douwe Maan2016-06-171-52/+0
|\
| * Re-use notifications dropdown/modal for user profileFelipe Artur2016-06-171-71/+0
| |\
| | * Re-use notifications dropdown on user profileFelipe Artur2016-06-161-71/+0
| | * Refactor custom notifications controller code and add specsFelipe Artur2016-06-141-0/+19
| * | Implement custom notification level optionsFelipe Artur2016-06-151-0/+19
* | | Removed update methodissuable-todo-improvementsPhil Hughes2016-06-171-86/+80
* | | Added todo controller tests for merge requestsPhil Hughes2016-06-171-37/+90
* | | Correctly checks if user is logged in when adding todoPhil Hughes2016-06-171-0/+13
* | | Improved manual todosPhil Hughes2016-06-171-0/+42
|/ /
* | Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative'Douwe Maan2016-06-151-0/+12
|\ \
| * | Fix Error 500 when viewing a blob with binary characters after the 1024-byte ...Stan Hu2016-06-121-0/+12
| |/
* | UI and copywriting improvements13948-access-request-to-projects-and-groupsRémy Coutable2016-06-141-15/+15
* | Factorize #request_access and #approve_access_request into a new AccessReque...Rémy Coutable2016-06-141-3/+3
* | Add request access for groupsRémy Coutable2016-06-141-18/+231
* | Project members with guest role can't access confidential issuesDouglas Barbosa Alexandre2016-06-131-1/+18
|/
* Add send_git_diff helperDouwe Maan2016-06-083-7/+93
|\
| * Merge branch 'issue_14189' into 'master' Jacob Schatz2016-06-071-0/+53
| |\
| | * Fix label order by priority on labels pageissue_14189Sean McGivern2016-06-071-0/+53
| * | Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-formatJacob Vosmaer (GitLab)2016-06-071-6/+3
| |\ \
| | * | Workhorse to serve raw diffsZeger-Jan van de Weg2016-06-031-6/+3
| * | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-061-0/+36
| |\ \ \ | | | |/ | | |/|
| | * | Update tests on wordingZ.J. van de Weg2016-06-061-2/+2
| | * | Backend awardables on commentsZJ van de Weg2016-06-061-0/+36
| * | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-061-0/+16
| |\ \ \ | | |/ /
| * | | Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski2016-06-031-1/+1
| | |/ | |/|
* | | Add workhorse controller and API helpersDouwe Maan2016-06-062-2/+5
| |/ |/|
* | Merge branch 'master' into awardablesawardablesZ.J. van de Weg2016-06-032-5/+87
|\ \ | |/
| * Merge branch '14139-sha-parameter-in-accept-merge-request-api' into 'master' Douwe Maan2016-06-031-0/+86
| |\
| | * Don't allow merges with new commitsSean McGivern2016-06-011-0/+86
| * | Update test since branch removal does not render template anymoredz-code-tabDmitriy Zaporozhets2016-06-031-4/+0
| |/
| * Enable Style/RedundantParentheses rubocop coprubocop/enable-redundant-parentheses-copGrzegorz Bizon2016-05-301-1/+1
* | Incorportate feedbackZ.J. van de Weg2016-06-011-3/+3
* | Merge branch 'master' into awardablesZJ van de Weg2016-05-304-5/+5
|\ \ | |/
| * Enable RSpec/NotToNot cop and auto-correct offensesrs-rubocop-nottonotRobert Speicher2016-05-244-5/+5
* | Merge branch 'master' into awardablesZJ van de Weg2016-05-252-1/+15
|\ \ | |/
| * Enable Style/SpaceAroundKeyword cop and fix offensesRobert Speicher2016-05-231-1/+1
| * Merge branch 'issue_9013' into 'master' Douwe Maan2016-05-201-0/+14
| |\
| | * Let users set notification levels in projects which they are not membersFelipe Artur2016-05-171-0/+14
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-181-1/+1
|\ \ \ | |/ /
| * | Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage'Dmitriy Zaporozhets2016-05-181-1/+1
| |\ \ | | |/ | |/|
| | * Change deprecated usage of rendering without response bodyMehmet Emin İNAÇ2016-03-161-1/+1
* | | Fix tests and wrong choices during mergeZeger-Jan van de Weg2016-05-121-2/+4
* | | Incorporate feedbackZeger-Jan van de Weg2016-05-111-3/+3
* | | Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-114-8/+105
|\ \ \ | |/ /
| * | Handle issue move access instead of raising errorfix/handle-issue-move-accessGrzegorz Bizon2016-04-301-0/+39
| * | Merge branch 'rs-diff_view' into 'master' Rémy Coutable2016-04-221-8/+0
| |\ \
| | * | Clarify that the diff view setting always comes from the cookiers-diff_viewRobert Speicher2016-04-191-8/+0
| * | | Merge branch 'issue_5838' into 'master' Rémy Coutable2016-04-211-0/+16
| |\ \ \
| | * | | Add changelog entry and fix convention in a specissue_5838Felipe Artur2016-04-201-1/+1
| | * | | Projects members tab should follow visibility levelsFelipe Artur2016-04-181-13/+2