summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into 21170-cycle-analyticsTimothy Andrew2016-09-20226-1425/+2716
|\
| * Merge branch 'sh-fix-last-activity-at-specs' into 'master' Rémy Coutable2016-09-201-4/+14
| |\
| | * Fix broken spec due to last_activity_at updates being throttledStan Hu2016-09-191-4/+14
| * | Merge remote-tracking branch 'upstream/master' into fix-download-artifacts-bu...Lin Jen-Shin2016-09-2020-98/+242
| |\ \
| | * \ Merge branch 'diff-table-width-fix' into 'master' Jacob Schatz2016-09-201-4/+5
| | |\ \
| | | * | Fixed large comments messing with diff table widthsdiff-table-width-fixPhil Hughes2016-09-121-4/+5
| | * | | Merge branch 'fix-build-trace-anchors' into 'master' Jacob Schatz2016-09-201-2/+11
| | |\ \ \
| | | * | | Now anchors to the top or bottom of the build trace with the correct offsetfix-build-trace-anchorsLuke Bennett2016-09-092-8/+8
| | | * | | trace step buttons now scroll 50px up or down at a timeLuke Bennett2016-09-092-4/+13
| | * | | | Merge branch 'master' into '21961-issues-filtering-issue-with-labels-that-con...21961-issues-filtering-issue-with-labels-that-contain-spacesLuke "Jared" Bennett2016-09-1983-427/+750
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge branch 'sh-prevent-duplicate-protected-branches-on-push' into 'master' Rémy Coutable2016-09-191-1/+1
| | | |\ \ \
| | | | * | | Only create a protected branch upon a push to a new branch if a rule for that...sh-prevent-duplicate-protected-branches-on-pushStan Hu2016-09-171-1/+1
| | | * | | | Merge branch 'throttle-last-activity-at' into 'master' Rémy Coutable2016-09-191-3/+14
| | | |\ \ \ \
| | | | * | | | Restrict last_activity_at updates to one per hourYorick Peterse2016-09-191-3/+14
| | | * | | | | 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
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Cleanup changesKamil Trzcinski2016-09-191-12/+1
| | | | * | | | | | | Update support for dynamic environmentsKamil Trzcinski2016-09-192-9/+9
| | | | * | | | | | | Verify expandability of variables defined as part of environmentKamil Trzcinski2016-09-191-2/+2
| | | | * | | | | | | Properly create deployment using all possible optionsKamil Trzcinski2016-09-191-7/+8
| | | | * | | | | | | Add support for dynamic environmentsKamil Trzcinski2016-09-194-3/+60
| | | | |/ / / / / /
| | | * | | | | | | Merge branch '22033-milestone-validation-returns-422' into 'master' Rémy Coutable2016-09-191-1/+1
| | | |\ \ \ \ \ \ \