summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'add-new-rake-task-for-gettext' into 'master'Douwe Maan2017-06-011-0/+8
|\
| * Add new Rake task to simplify the compilation of PO filesadd-new-rake-task-for-gettextRuben Davila2017-06-011-0/+8
* | Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper`Bob Van Landuyt2017-06-018-70/+68
* | Merge branch 'zj-realtime-env-list' into 'master'Kamil Trzciński2017-06-011-1/+7
|\ \ | |/ |/|
| * Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-06-0167-508/+1594
| |\
| * \ Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-05-2515-119/+418
| |\ \
| * | | Restore original comment [ci skip]Z.J. van de Weg2017-05-241-1/+1
| * | | Use etag caching for environments JSONZ.J. van de Weg2017-05-221-2/+7
* | | | Merge branch '24196-protected-variables' into 'master'Kamil Trzciński2017-06-013-1/+12
|\ \ \ \
| * \ \ \ Merge branch 'master' into '24196-protected-variables'Kamil Trzciński2017-06-018-21/+159
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-06-0117-47/+243
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-05-3115-16/+366
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into '24196-protected-variables'Lin Jen-Shin (godfat)2017-05-2637-429/+840
| |\ \ \ \ \ \
| * | | | | | | API and doc for protected variablesLin Jen-Shin2017-05-252-1/+4
| * | | | | | | Frontend implementation, tests, and changelogLin Jen-Shin2017-05-251-0/+8
* | | | | | | | Merge branch 'migrate-old-artifacts' into 'master'Grzegorz Bizon2017-06-016-35/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Add missing specsKamil Trzcinski2017-06-015-34/+15
| * | | | | | | | Fix data inconsistency issue for old artifacts by moving them to a currently ...Kamil Trzcinski2017-06-015-5/+5
* | | | | | | | | Merge branch 'bugfix/deploy_keys__can_push__usage_in_api' into 'master'Rémy Coutable2017-06-011-0/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add missing `can_push` parameter to POST /v3/deploy_keysRichard Clamp2017-05-221-0/+1
* | | | | | | | | Merge branch 'fix_diff_line_comments' into 'master'Sean McGivern2017-06-011-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix: A diff comment on a change at last line of a file shows as two comments ...Valery Sizov2017-05-311-0/+4
* | | | | | | | | | Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern2017-06-019-45/+51
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Change no_limits to limitsdm-collapsed-blobDouwe Maan2017-05-316-11/+11
| * | | | | | | | | Fix Diff#too_large? and specsDouwe Maan2017-05-301-3/+5
| * | | | | | | | | Fix Diff#to_hash and #init_from_hashDouwe Maan2017-05-301-0/+3
| * | | | | | | | | Consistent diff and blob size limit namesDouwe Maan2017-05-299-49/+50
* | | | | | | | | | Merge branch 'master' into 'trigger-source'Grzegorz Bizon2017-05-3119-64/+249
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add feature toggles through FlipperAlejandro Rodríguez2017-05-315-2/+120
| * | | | | | | | | | Merge branch 'dm-gitmodules-parsing' into 'master'Grzegorz Bizon2017-05-311-17/+30
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| | * | | | | | | | | Remove entry variabledm-gitmodules-parsingDouwe Maan2017-05-311-10/+9
| | * | | | | | | | | Make .gitmodules parsing more resilient to syntax errorsDouwe Maan2017-05-301-16/+30
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-319-41/+200
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'tc-improve-project-api-perf' into 'master'Douwe Maan2017-05-315-39/+54
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Remove some deprecated methodstc-improve-project-api-perfToon Claes2017-05-302-2/+2
| | | * | | | | | | | | | Add :owned param to ProjectFinderToon Claes2017-05-303-7/+4
| | | * | | | | | | | | | Use helper to construct Finder paramsToon Claes2017-05-303-9/+12
| | | * | | | | | | | | | Use ProjectFinder to filter the projectsToon Claes2017-05-302-13/+4
| | | * | | | | | | | | | Handle `membership` in ProjectFinderToon Claes2017-05-302-5/+4
| | | * | | | | | | | | | Build options hash after finding the list of projectsToon Claes2017-05-301-5/+6
| | | * | | | | | | | | | Move ProjectsFinder to `present_projects` for simplificationToon Claes2017-05-301-12/+9
| | | * | | | | | | | | | Copy `filter_projects` helper to V3Toon Claes2017-05-301-0/+27
| | | |/ / / / / / / / /
| | * | | | | | | | | | Merge branch '33000-tag-list-in-project-create-api' into 'master'Rémy Coutable2017-05-311-0/+2
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Add tag_list param to project apivanadium232017-05-311-0/+2
| | | |/ / / / / / / / /
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-3120-48/+408
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| * | | | | | | | | | | Should escape the routes because we added -Lin Jen-Shin2017-05-271-1/+1
| * | | | | | | | | | | Use - as the prefix so we don't conflict with namespacesLin Jen-Shin2017-05-261-0/+1
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-2656-354/+1154
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Routing helpers are no longer neededLin Jen-Shin2017-05-241-3/+0
| * | | | | | | | | | | | Add checks before redirect, remove status/traceLin Jen-Shin2017-05-241-2/+0
View Lorry Controller Status