summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix notes on confidential issues through JSON to users without accessDouglas Barbosa Alexandre2016-06-141-1/+1
* Merge branch '17298-wiki-xss' into 'master' Robert Speicher2016-06-141-0/+3
|\
| * Forbid scripting for wiki filesSean McGivern2016-06-141-0/+3
* | Merge branch 'settings-dropdown-permissions' into 'master' Dmitriy Zaporozhets2016-06-142-49/+50
|\ \
| * | Pass can_edit and access to partial.Connor Shea2016-06-132-3/+1
| * | Fix a bug that allowed Guests to still see Settings links they couldn't access.Connor Shea2016-06-101-1/+2
| * | Fix displaying of project settings links the user cannot access.Connor Shea2016-06-102-48/+50
* | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-1415-93/+108
|\ \ \ | | |/ | |/|
| * | 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
* | | | | Fix keep action of build artifacts widgetKamil Trzcinski2016-06-131-1/+1
* | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-132-5/+14
|\ \ \ \ \ | |/ / / /
| * | | | 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 remote-tracking branch 'origin/master' into artifacts-expire-dateKamil Trzcinski2016-06-1310-52/+68
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | | | Fixed spacing with row below in build sidebarPhil Hughes2016-06-131-1/+1
* | | | | | | | Improve design based on reviewKamil Trzcinski2016-06-131-5/+4
* | | | | | | | Added missing span element around timePhil Hughes2016-06-131-3/+3
* | | | | | | | Displays time remaining relative to nowPhil Hughes2016-06-132-2/+9
* | | | | | | | Test ExpireBuildArtifactsWorkerKamil Trzcinski2016-06-131-1/+1
* | | | | | | | Test controllers if they allow to keep artifactsKamil Trzcinski2016-06-131-0/+1
* | | | | | | | Allow to show the time in the futureKamil Trzcinski2016-06-133-5/+9
* | | | | | | | Show the artifacts expiration prompt in Build Artifacts widgetKamil Trzcinski2016-06-132-19/+20
* | | | | | | | Remove keep_artifacts from BuildsControllerKamil Trzcinski2016-06-131-6/+0
* | | | | | | | Validate existence of artifacts in ArtifactsController, render 404 if not foundKamil Trzcinski2016-06-131-6/+5
* | | | | | | | Add artifacts_expire_in method for Ci::BuildKamil Trzcinski2016-06-131-0/+12
* | | | | | | | Move keep to ArtifactsControllerKamil Trzcinski2016-06-134-14/+21
* | | | | | | | Allow to expire build artifactsKamil Trzcinski2016-06-134-2/+43
|/ / / / / / /
* | | | | | | Merge branch '18446-when-this-merge-request-is-accepted-this-issue-will-be-cl...Rémy Coutable2016-06-135-9/+7
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
View Lorry Controller Status