summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Remove duplicated method.Ruben Davila2016-09-201-4/+0
* Merge branch 'update_issues_mr_counter' into 'master' Rémy Coutable2016-09-2013-48/+63
* Merge branch 'gitlab-workhorse-safeties' into 'master'Jacob Vosmaer (GitLab)2016-09-201-0/+4
* Merge branch '18302-use-rails-cookie-in-api' into 'master' Rémy Coutable2016-09-201-8/+0
* Merge branch 'sh-prevent-duplicate-protected-branches-on-push' into 'master' Rémy Coutable2016-09-201-1/+1
* Merge branch '21961-issues-filtering-issue-with-labels-that-contain-spaces' i...Jacob Schatz2016-09-203-9/+11
* Merge branch 'fix-build-trace-anchors' into 'master' Jacob Schatz2016-09-201-2/+11
* Merge branch 'diff-table-width-fix' into 'master' Jacob Schatz2016-09-201-4/+5
* Merge branch 'sh-fix-last-activity-at-specs' into 'master' Rémy Coutable2016-09-201-4/+14
* Merge branch 'commit-notes-jump-to-button-remove' into 'master' Robert Speicher2016-09-201-1/+2
* Merge branch 'maxiperezc/gitlab-ce-issues_17198' into 'master' Douwe Maan2016-09-204-2/+34
* Merge branch 'feature/github-edit-path' into 'master' Rémy Coutable2016-09-205-13/+37
* Merge branch 'throttle-last-activity-at' into 'master' Rémy Coutable2016-09-201-3/+14
* Merge branch 'lfs-support-for-ssh-enabled' into 'master' Douwe Maan2016-09-202-4/+6
* Merge branch 'fix-download-artifacts-button-link' into 'master' Douwe Maan2016-09-201-1/+1
* Merge branch 'order-stages-by-pipeline' into 'master' Rémy Coutable2016-09-201-2/+2
* Merge branch 'merge-request-push-compare-ui' into 'master' Jacob Schatz2016-09-204-45/+86
* Merge branch 'fix-regression-in-handling-build-updated' into 'master' Rémy Coutable2016-09-202-11/+14
* Merge branch '22218-fix-note-form-footer' into 'master' Robert Speicher2016-09-203-11/+20
* Merge branch 'add_optional_author_for_commits' into 'master' Rémy Coutable2016-09-206-58/+64
* Merge branch 'per-build-token-without-lfs' into 'master' Rémy Coutable2016-09-199-65/+138
|\
| * Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab-ce/merg...Kamil Trzcinski2016-09-192-7/+1
| * Merge branch 'master' into per-build-tokenKamil Trzcinski2016-09-1960-269/+372
| |\
| * | Don't leak build tokens in build logsKamil Trzcinski2016-09-192-7/+15
| * | Improve authentication_result usageKamil Trzcinski2016-09-161-11/+18
| * | Simplify checking of allowed abilities in git_http_client_controllerKamil Trzcinski2016-09-161-42/+33
| * | Improve code commentsKamil Trzcinski2016-09-163-4/+4
| * | Fix specs after renaming authentication_capabilitiesKamil Trzcinski2016-09-161-3/+3
| * | Rename capabilities to authentication_abilitiesKamil Trzcinski2016-09-164-14/+16
| * | Added builds_spec and git_http_specsKamil Trzcinski2016-09-151-1/+1
| * | Fix specs after merging LFS changesKamil Trzcinski2016-09-151-2/+12
| * | Merge remote-tracking branch 'origin/lfs-support-for-ssh' into per-build-tokenKamil Trzcinski2016-09-1512-66/+198
| |\ \
| | * | Refactored authentication code to make it a bit clearer, added test for wrong...Patricio Cano2016-09-151-8/+17
| | * | Further refactoring of authentication code, and code style fixes.Patricio Cano2016-09-151-8/+12
| | * | Use special characters for `lfs+deploy-key` to prevent a someone from creatin...Patricio Cano2016-09-151-2/+2
| | * | Better authentication handling, syntax fixes and better actor handling for LF...Patricio Cano2016-09-152-15/+14
| | * | Refactored handling of the `LfsToken` and added functionality to it to simpli...Patricio Cano2016-09-151-3/+1
| | * | Refactor LFS token logic to use a Redis key instead of a DB field, making it ...Patricio Cano2016-09-154-10/+7
| | * | Added LFS support to SSHPatricio Cano2016-09-154-14/+38
| * | | Fix most of specsKamil Trzcinski2016-09-151-2/+5
| * | | Simplify LFS helperKamil Trzcinski2016-09-151-4/+0
| * | | Fix existing authorization specsKamil Trzcinski2016-09-154-9/+8
| * | | Merge remote-tracking branch 'origin/master' into per-build-tokenKamil Trzcinski2016-09-1530-266/+236
| |\ \ \
| * | | | Add access specsKamil Trzcinski2016-09-151-1/+1
| * | | | Use `build_read_container_image` and use `build_download_code`Kamil Trzcinski2016-09-154-42/+37
| * | | | Make result to return project and capabilities grantedKamil Trzcinski2016-09-135-46/+27
| * | | | Use a permissions of user to access all dependent projects from CI jobs (this...Kamil Trzcinski2016-09-138-31/+91
* | | | | Merge branch 'fix/import-export-db-errors' into 'master' Rémy Coutable2016-09-191-5/+6
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | squashed - Fix DB exceptions raised importing some specific projects.James Lopez2016-09-191-5/+6
* | | | | Merge branch 'review-apps' into 'master' Rémy Coutable2016-09-193-8/+55
|\ \ \ \ \