summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Add Pipelines for CommitKamil Trzcinski2016-09-271-8/+9
* Merge branch 'includes-projects-to-render-issue-notes' into 'master' Yorick Peterse2016-09-271-1/+1
|\
| * Fix IssuesController#show degradation including project on loaded notesincludes-projects-to-render-issue-notesPaco Guzman2016-09-271-1/+1
* | Be nice to Docker Clients talking to JWT/authKamil Trzcinski2016-09-271-5/+16
|/
* Merge branch 'dz-profile-organization' into 'master' Dmitriy Zaporozhets2016-09-271-1/+2
|\
| * Add organization field to user profileDmitriy Zaporozhets2016-09-271-1/+2
* | Merge branch 'rc-new-members-approve-request-access-service' into 'master' Douwe Maan2016-09-271-6/+1
|\ \ | |/ |/|
| * Ensure Members::ApproveAccessRequestService can fin a requester by IDRémy Coutable2016-09-221-1/+1
| * New Members::ApproveAccessRequestServiceRémy Coutable2016-09-221-6/+1
* | Fix snippets pagination22500-can-t-paginate-through-snippetsRémy Coutable2016-09-261-1/+1
* | Merge branch 'search-filters-label-fix' into 'master' Jacob Schatz2016-09-231-2/+2
|\ \
| * | Fixed search dropdown labels not displayingsearch-filters-label-fixPhil Hughes2016-09-121-2/+2
* | | Revert part of "Merge branch 'update_issues_mr_counter' into 'master'Rémy Coutable2016-09-225-20/+0
| |/ |/|
* | Merge branch 'and-you-get-awards' into 'master' Rémy Coutable2016-09-213-3/+13
|\ \
| * | Start Frontend work, fix routing problemZ.J. van de Weg2016-09-192-2/+5
| * | Snippets get award emoji! :thumbsup:Z.J. van de Weg2016-09-192-2/+9
* | | Merge branch 'post-merge-improve-of-ci-permissions' into 'master' Rémy Coutable2016-09-212-6/+6
|\ \ \
| * | | Improve JwtController implementationpost-merge-improve-of-ci-permissionsKamil Trzcinski2016-09-201-3/+3
| * | | Post-merge improve of CI permissionsKamil Trzcinski2016-09-201-3/+3
* | | | Merge branch '21170-cycle-analytics' into 'master' Stan Hu2016-09-211-0/+67
|\ \ \ \
| * | | | Implement fourth round of comments from @DouweM.Timothy Andrew2016-09-211-3/+8
| * | | | Move JSON generation (cycle analytics) into a controller method.Timothy Andrew2016-09-201-2/+34
| * | | | Merge remote-tracking branch 'origin/master' into 21170-cycle-analyticsTimothy Andrew2016-09-2016-108/+176
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Move cycle analytics JSON generation to a helper.Timothy Andrew2016-09-171-1/+3
| * | | | Add a JSON version of the `CycleAnalytics` page.Timothy Andrew2016-09-081-0/+5
| * | | | Merge remote-tracking branch 'origin/master' into 21170-cycle-analyticsTimothy Andrew2016-09-0723-80/+121
| |\ \ \ \
| * | | | | Authorize access to cycle analytics.Timothy Andrew2016-08-261-0/+2
| * | | | | Fetch cycle analytics data for a specific date range.Timothy Andrew2016-08-261-1/+17
| * | | | | Scope Cycle Analytics queries to a projectTimothy Andrew2016-08-261-1/+1
| * | | | | Add the "Plan" Cycle Analytics query.Timothy Andrew2016-08-261-28/+1
| * | | | | Display numbers for the "Issue (Tracker)" cycle analytics metric.Timothy Andrew2016-08-261-0/+32
* | | | | | fix issues mr counterbarthc2016-09-205-20/+21
| |_|_|/ / |/| | | |
* | | | | Merge branch 'feature/github-edit-path' into 'master' Rémy Coutable2016-09-201-3/+4
|\ \ \ \ \
| * | | | | modify github import JS and controller so we can now specify a namespace and/...James Lopez2016-09-201-3/+4
| | |_|/ / | |/| | |
* | | | | Merge branch 'maxiperezc/gitlab-ce-issues_17198' into 'master' Douwe Maan2016-09-201-0/+7
|\ \ \ \ \
| * | | | | Fix initial implementation to actually render the unsubscribe pageRémy Coutable2016-09-201-2/+5
| * | | | | Fix "Unsubscribe" link in notification emails that is triggered by anti-virusMaximiliano Perez Coto2016-09-201-0/+4
| |/ / / /
* | | | | Move logic to check ci? or lfs_deploy_token? to Gitlab::Auth::ResultKamil Trzcinski2016-09-201-7/+3
* | | | | Revert "Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab...lfs-supportKamil Trzcinski2016-09-191-0/+6
|/ / / /
* | | | Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab-ce/merg...Kamil Trzcinski2016-09-191-6/+0
* | | | Merge branch 'master' into per-build-tokenKamil Trzcinski2016-09-195-4/+26
|\ \ \ \
| * \ \ \ Merge branch '22248-fix-namespace-undefined-method' into 'master' Rémy Coutable2016-09-191-0/+4
| |\ \ \ \
| | * | | | Render invalid template for merge requests without source project and openKatarzyna Kobierska2016-09-161-0/+4
| * | | | | Replace contributions calendar timezone payload with datesClement Ho2016-09-161-1/+1
| |/ / / /
| * | | | Merge branch 'group-specific-lfs-settings' into 'master' Rémy Coutable2016-09-162-2/+20
| |\ \ \ \
| | * | | | Syntax fixes and better tests for helper methods. Updated docs.group-specific-lfs-settingsPatricio Cano2016-09-152-9/+9
| | * | | | Added group-specific setting for LFS.Patricio Cano2016-09-152-2/+20
| * | | | | Fix spelling: sucessfully -> successfullyStan Hu2016-09-151-1/+1
| |/ / / /
* | | | | Don't leak build tokens in build logsKamil Trzcinski2016-09-191-1/+5
* | | | | Improve authentication_result usageKamil Trzcinski2016-09-161-11/+18