summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Factorize members mails into a new Emails::Members moduleRémy Coutable2016-06-1434-222/+176
* Factorize access request routes into a new :access_requestable route concernRémy Coutable2016-06-142-3/+3
* Factorize #request_access and #approve_access_request into a new AccessReque...Rémy Coutable2016-06-143-31/+66
* Add request access for groupsRémy Coutable2016-06-1454-469/+519
* Initial implementation of user access request to projectsDavid Alexander2016-06-1416-14/+240
* Merge branch 'confidential-issues-in-private-projects' into 'master' Douwe Maan2016-06-147-31/+40
|\
| * Use Issue.visible_to_user in Notes.search to avoid query duplicationDouglas Barbosa Alexandre2016-06-133-30/+14
| * Project members with guest role can't access confidential issuesDouglas Barbosa Alexandre2016-06-137-14/+39
| * Allow users to create confidential issues in private projectsDouglas Barbosa Alexandre2016-06-131-1/+1
* | Merge branch 'bentolor/gitlab-ce-fix/bamboo-service-trigger-auth' into 'master' Rémy Coutable2016-06-142-37/+44
|\ \
| * | Fix broken URI joining for `teamcity_url` with suffixesRémy Coutable2016-06-141-18/+19
| * | Factorize duplicated code into a method in BambooService and update specsRémy Coutable2016-06-141-20/+17
| * | Fix broken URI joining for `bamboo_url` with suffixesBenjamin Schmid2016-06-141-4/+4
| * | Honor credentials on calling Bamboo CI triggerBenjamin Schmid2016-06-141-4/+13
| |/
* | Merge branch 'issue_14572' into 'master' Rémy Coutable2016-06-141-1/+19
|\ \ | |/ |/|
| * Add more information into RSS fead for issuesAlexander Matyushentsev2016-06-131-1/+19
* | Remove deprecated issues_tracker and issues_tracker_id from projectDouglas Barbosa Alexandre2016-06-132-20/+3
* | Merge branch 'dz-cleanup-counters' into 'master' Dmitriy Zaporozhets2016-06-131-2/+0
|\ \
| * | Remove counters from Pipeline navigationdz-cleanup-countersDmitriy Zaporozhets2016-06-131-2/+0
* | | Merge branch 'gitlab-auth-method-names' into 'master' Douwe Maan2016-06-132-2/+2
|\ \ \ | |_|/ |/| |
| * | Improve Gitlab::Auth method namesJacob Vosmaer2016-06-102-2/+2
* | | Merge branch 'fix-related-branches-error-500' into 'master' Kamil Trzciński2016-06-131-1/+1
|\ \ \
| * | | Fix typo causing related branches to Error 500fix-related-branches-error-500Stan Hu2016-06-121-1/+1
| | |/ | |/|
* | | Merge branch 'fix-bulk-assign-labels' into 'master' Jacob Schatz2016-06-131-4/+13
|\ \ \
| * | | Fixes a bug when assigning a label to multiple issuesfix-bulk-assign-labelsAlfredo Sumaran2016-06-101-4/+13
* | | | Merge branch '18377-cherry-pick-crashes-when-choosing-a-tag' into 'master' Rémy Coutable2016-06-132-1/+5
|\ \ \ \
| * | | | Only show branches for revert / cherry-pick18377-cherry-pick-crashes-when-choosing-a-tagSean McGivern2016-06-132-1/+5
* | | | | Merge branch 'issue_3359_2' into 'master' Douwe Maan2016-06-138-51/+63
|\ \ \ \ \
| * | | | | Remove notification level fild from users, improve migrations and specsissue_3359_2Felipe Artur2016-06-104-29/+18
| * | | | | Remove notification level from user modelFelipe Artur2016-06-108-50/+73
* | | | | | Merge branch '18446-when-this-merge-request-is-accepted-this-issue-will-be-cl...Rémy Coutable2016-06-135-9/+7
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Don't try to count a relation with aliases18446-when-this-merge-request-is-accepted-this-issue-will-be-closed-automatically-rendered-twiceSean McGivern2016-06-104-7/+7
| * | | | | Only show issues closing MR when presentSean McGivern2016-06-101-2/+0
| |/ / / /
* | | | | Merge branch 'nav-offscreen-dz-patch' into 'master' Dmitriy Zaporozhets2016-06-115-27/+3
|\ \ \ \ \
| * | | | | Center layout navigation and remove iconsnav-offscreen-dz-patchDmitriy Zaporozhets2016-06-115-27/+3
* | | | | | Merge branch '18417-nav-offscreen' into 'master' Dmitriy Zaporozhets2016-06-1116-179/+124
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix preferences_spec test18417-nav-offscreenAnnabel Dunstone2016-06-102-5/+1
| * | | | | Add back sidebar counters and usernameAnnabel Dunstone2016-06-109-15/+33
| * | | | | Fix safari logo loading animation safari bugAnnabel Dunstone2016-06-102-8/+1
| * | | | | Revert side nav to full width; remove border under nav; remove tooltips on na...Annabel Dunstone2016-06-1012-145/+52
| * | | | | Update media queriesAnnabel Dunstone2016-06-101-3/+3
| * | | | | Fix profile testAnnabel Dunstone2016-06-101-1/+1
| * | | | | Fix logo at all screen widths, update sidebar textAnnabel Dunstone2016-06-107-56/+78
| * | | | | Move tanuki icon to center of nav bar; keep nav closed by default; remove col...Annabel Dunstone2016-06-108-36/+44
* | | | | | Merge branch '18463-search-form-padding-is-too-damn-high' into 'master' Dmitriy Zaporozhets2016-06-111-1/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fixed search form paddingLuke "Jared" Bennett2016-06-101-1/+0
* | | | | | Merge branch 'finding-multiple-projects-by-paths' into 'master' Robert Speicher2016-06-101-11/+60
|\ \ \ \ \ \
| * | | | | | Add Project.where_paths_infinding-multiple-projects-by-pathsYorick Peterse2016-06-101-11/+60
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '18462-remove-unused-mergerequest-gitlab_merge_status-method' in...Robert Speicher2016-06-101-8/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Remove unused MergeRequest#gitlab_merge_status methodRémy Coutable2016-06-101-8/+0