summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '22191-delete-dynamic-envs-mr' into 'master' Rémy Coutable2016-10-191-2/+16
|\
| * Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-182-5/+9
| |\
| * \ Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-184-12/+75
| |\ \
| * | | Add specs to test on_stop and action on environmentsKamil Trzcinski2016-10-171-0/+4
| * | | Improve after code reviewKamil Trzcinski2016-10-171-2/+2
| * | | Add `action` and `on_stop` to `environment` in .gitlab-ci.ymlKamil Trzcinski2016-10-171-3/+11
| * | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-175-21/+55
| |\ \ \
| * | | | Initial support for closing environmentsKamil Trzcinski2016-10-061-1/+3
* | | | | Merge branch 'pipeline-emails' into 'master' Kamil Trzciński2016-10-181-0/+49
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailspipeline-emailsLin Jen-Shin2016-10-184-12/+75
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-144-6/+14
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-0816-51/+172
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-0415-121/+130
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-2117-78/+470
| |\ \ \ \ \ \
| * | | | | | | Make various trace methods take last_lines argument:Lin Jen-Shin2016-09-211-0/+49
* | | | | | | | Merge branch 'adam-fix-mr-diff-symlink-file-conversion' into 'master' Sean McGivern2016-10-182-5/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Fix the diff in the merge request view when converting a symlink to a regular...adam-fix-mr-diff-symlink-file-conversionAdam Niedzielski2016-10-172-5/+9
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-171-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'fix/reassign-secret-token-on-generate' into 'master' Douwe Maan2016-10-141-2/+2
| |\ \ \ \ \ \
| | * | | | | | Reassign secret token when regenerating onefix/reassign-secret-token-on-generateGrzegorz Bizon2016-10-131-2/+2
* | | | | | | | Add blob_ace_mode to conflict content responseSean McGivern2016-10-131-0/+5
* | | | | | | | Simplify conflict file JSON creationSean McGivern2016-10-131-7/+15
* | | | | | | | Allow setting content for resolutionsSean McGivern2016-10-134-13/+63
|/ / / / / / /
* | | | | | | Convert UTF-8 Emoji to Gitlab emojiJohan H2016-10-131-2/+5
* | | | | | | Convert unicode emojis to images.henrik2016-10-111-1/+6
|/ / / / / /
* | | | | | Merge branch 'explain-0600' into 'master' Robert Speicher2016-10-101-1/+1
|\ \ \ \ \ \
| * | | | | | Explain the extra chmodJacob Vosmaer2016-09-261-1/+1
* | | | | | | Correct namespace validation to forbid bad names #21077Will Starms2016-10-071-2/+2
| |_|_|_|/ / |/| | | | |
* | | | | | Load Github::Shell's secret token from file on initialization instead of ever...Justin DiPierro2016-10-061-15/+31
* | | | | | Merge branch 'fix/github-importer-client' into 'master' Rémy Coutable2016-10-061-2/+12
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix broken handling of certain calls in GitHub importer clientfix/github-importer-clientAhmad Sherif2016-10-061-2/+12
* | | | | | Use higher size on Gitlab::Redis connection pool on Sidekiq serversPaco Guzman2016-10-061-1/+11
* | | | | | Merge remote-tracking branch 'dev/master'Rémy Coutable2016-10-063-5/+25
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix/id-claim-import-issue' into 'master' Douwe Maan2016-09-303-5/+25
| |\ \ \ \ \ \
| | * | | | | | updated attribute cleaner to use allowed keyword and reject attributesJames Lopez2016-09-271-3/+3
| | * | | | | | Prevent claiming associated model IDs via import and added relevant specsJames Lopez2016-09-273-5/+25
| | | |/ / / / | | |/| | | |
* | | | | | | Merge commit 'dev/security' into 'master'Rémy Coutable2016-10-067-7/+18
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | fix export project file permissions issueJames Lopez2016-09-307-7/+18
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'test-improve-gitlab-identifier' into 'master' Rémy Coutable2016-10-051-8/+50
|\ \ \ \ \ \
| * | | | | | Refactor Gitlab::IdentifierYorick Peterse2016-10-051-8/+50
| | |_|_|_|/ | |/| | | |
* | | | | | Skip wiki creation when GitHub project has wiki enabledDouglas Barbosa Alexandre2016-10-042-13/+25
|/ / / / /
* | | | | Merge branch 'aiionx_sidekiq_log_patch' into 'master' Rémy Coutable2016-10-031-1/+1
|\ \ \ \ \
| * | | | | aiionx_sidekiq_log_patchDavid2016-04-151-1/+1
* | | | | | Merge branch '21983-member-add_user-doesn-t-detect-existing-members-that-have...Robert Speicher2016-10-021-0/+4
|\ \ \ \ \ \
| * | | | | | Allow Member.add_user to handle access requestersRémy Coutable2016-09-281-0/+4
* | | | | | | Merge branch 'initialize-redis' into 'master' Yorick Peterse2016-09-301-18/+6
|\ \ \ \ \ \ \
| * | | | | | | Initialize Redis pool in single-threaded contextJacob Vosmaer2016-09-301-18/+6
* | | | | | | | Fix race condition that can be triggered if the token expires right after we ...lfs-token-race-condition-fixPatricio Cano2016-09-291-7/+2
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch 'lfs-ssh-authorization-fix' into 'master' Douwe Maan2016-09-282-11/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Handle LFS token creation and retrieval in the same method, and in the same R...lfs-ssh-authorization-fixPatricio Cano2016-09-282-13/+10
View Lorry Controller Status