summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Configure Gitaly through settings file instead of ENV varsgitaly-testing-tomlAlejandro Rodríguez2017-04-181-0/+37
* Merge branch 'contributing-ci-templates' into 'master' Rémy Coutable2017-04-121-1/+1
|\
| * Include CONTRIBUTING.md file when importing .gitlab-ci.yml templatescontributing-ci-templatesAdam Niedzielski2017-04-121-1/+1
* | Merge branch '29056-backport-ee-cleanup-database-file' into 'master' Douwe Maan2017-04-122-4/+12
|\ \
| * | removes redundant code from database.rb29056-backport-ee-cleanup-database-fileTiago Botelho2017-04-112-4/+12
* | | Merge branch 'zj-fix-coverage-bug' into 'master' Kamil Trzciński2017-04-121-1/+4
|\ \ \
| * | | Return nil as coverage instead of a File objectzj-fix-coverage-bugZ.J. van de Weg2017-04-121-1/+4
| |/ /
* | | Merge branch 'zj-api-fix-build-events' into 'master' Rémy Coutable2017-04-121-3/+9
|\ \ \
| * | | Fix API not accepting job_events for webhookszj-api-fix-build-eventsZ.J. van de Weg2017-04-121-3/+9
| | |/ | |/|
* | | Merge branch 'gitaly-testing' into 'master' Rémy Coutable2017-04-121-32/+40
|\ \ \ | |/ / |/| |
| * | Setup and run a Gitaly server for testing if GitalyClient is enabledgitaly-testingAlejandro Rodríguez2017-04-111-32/+40
* | | Merge branch 'bb_save_trace' into 'master' Sean McGivern2017-04-122-6/+4
|\ \ \
| * | | [BB Importer] Save the error trace and the whole raw documentbb_save_traceValery Sizov2017-04-112-6/+4
| | |/ | |/|
* | | Merge branch 'dm-outdated-diff-link' into 'master' Sean McGivern2017-04-111-0/+6
|\ \ \
| * | | Cache MR diffs by diff refsDouwe Maan2017-04-081-0/+6
* | | | Merge branch '28017-separate-ce-params-on-api' into 'master' Douwe Maan2017-04-116-30/+111
|\ \ \ \ | |_|/ / |/| | |
| * | | Add share_with_group_lock to CE optional params block28017-separate-ce-params-on-apiOswaldo Ferreira2017-04-101-0/+1
| * | | Separate CE params on Grape APIOswaldo Ferreira2017-04-106-30/+110
* | | | Merge branch 'fix/gb/improve-container-registry-clipboard-links' into 'master' Kamil Trzciński2017-04-111-0/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Add method that returns location of registry imageGrzegorz Bizon2017-04-101-0/+4
| |/ /
* | | Merge branch 'backport-ee-1525' into 'master' Robert Speicher2017-04-108-57/+91
|\ \ \
| * | | Don't pass `env` anymore to GitAccess, ChangeAccess, and ForcePushbackport-ee-1525Rémy Coutable2017-04-103-7/+4
| * | | Retrieve Git-specific env in Gitlab::Git::RevList and add a new #new_refs methodRémy Coutable2017-04-102-31/+28
| * | | Retrieve Git-specific env in Gitlab::Git::Repository#ruggedRémy Coutable2017-04-101-1/+9
| * | | Set Git-specific env in /api/internal/allowedRémy Coutable2017-04-102-18/+12
| * | | Add a Gitlab::Git::Env to store Git-specific env thread-safelyRémy Coutable2017-04-101-0/+38
* | | | Merge branch 'merge-request-parser-merge-requests-for-nodes' into 'master' Douwe Maan2017-04-101-11/+30
|\ \ \ \ | |/ / / |/| | |
| * | | Reuse "merge_requests_for_nodes" in "MergeRequestParser"merge-request-parser-merge-requests-for-nodesAdam Niedzielski2017-04-101-11/+30
| | |/ | |/|
* | | Test all enabled routes in ETag caching middleware and fix pipeline routestest-all-etag-routesAdam Niedzielski2017-04-102-34/+41
|/ /
* | Remove the User#is_admin? methodblackst0ne2017-04-0913-22/+22
|/
* Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-0710-40/+138
|\
| * Merge branch 'adam-finish-5993-closed-issuable' into 'master' Douwe Maan2017-04-079-40/+124
| |\
| | * Add indication for closed or merged issuables in GFMadam-finish-5993-closed-issuableAdam Buckland2017-04-079-40/+124
| * | Merge branch 'feature/add-rake-task-prints-storage-config-in-toml' into 'mast...Robert Speicher2017-04-071-0/+14
| |\ \ | | |/ | |/|
| | * Add rake task that prints TOML storage configurationfeature/add-rake-task-prints-storage-config-in-tomlAhmad Sherif2017-04-041-0/+14
* | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-078-23/+169
|\ \ \ | |/ /
| * | Fix rake test to import Github repositoriesDouglas Barbosa Alexandre2017-04-071-2/+9
| * | Merge branch 'bvl-fix-project-ci-status-cache' into 'master' Kamil Trzciński2017-04-071-0/+103
| |\ \
| | * | Take the ref of a pipeline into account when caching statusBob Van Landuyt2017-04-071-9/+18
| | * | Rename `ProjectBuildStatus` -> `ProjectPipelineStatus`Bob Van Landuyt2017-04-071-1/+1
| | * | Wrap updating of cache after pipeline transition in class methodBob Van Landuyt2017-04-071-0/+4
| | * | Rename Ci::PipelineStatus -> Ci::ProjectBuildStatusBob Van Landuyt2017-04-071-0/+90
| * | | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-076-21/+57
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0624-151/+533
| | |\ \
| | * \ \ Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tagsJames Edwards-Jones2017-04-0612-23/+279
| | |\ \ \
| | * | | | Fix projected import failing on missing relationsJames Edwards-Jones2017-04-061-1/+5
| | * | | | Protected Tags backend review changesJames Edwards-Jones2017-04-061-8/+2
| | * | | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0677-359/+1041
| | |\ \ \ \
| | * | | | | Fixed UserAccess#can_create_tag? after create_access_levels renameJames Edwards-Jones2017-04-041-1/+1
| | * | | | | Renamed ProtectedTag push_access_levels to create_access_levelsJames Edwards-Jones2017-04-042-2/+2
View Lorry Controller Status