summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* 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 '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-121-2/+2
|\ \ \
| * | | [BB Importer] Save the error trace and the whole raw documentbb_save_traceValery Sizov2017-04-111-2/+2
| | |/ | |/|
* | | 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
* | | 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
* | | Add a Gitlab::Git::Env to store Git-specific env thread-safelyRémy Coutable2017-04-101-0/+38
* | | 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-092-2/+2
|/
* Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-076-14/+157
|\
| * 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-075-14/+54
| |\ \ | | |/ | |/|
| | * Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-069-51/+324
| | |\
| | * \ Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tagsJames Edwards-Jones2017-04-064-17/+68
| | |\ \
| | * | | 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-0642-210/+736
| | |\ \ \
| | * | | | 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
| | * | | | Attempt to fix import/export of push_access_levels for protected tagsJames Edwards-Jones2017-04-042-1/+4
| | * | | | Cleanup & tests for UserAccess#can_create_tag?James Edwards-Jones2017-04-042-8/+5
| | * | | | Protected Tags prevents all updates instead of just force pushes.James Edwards-Jones2017-04-041-5/+9
| | * | | | Clean up non TODO rubocop errorsJames Edwards-Jones2017-04-032-5/+5
| | * | | | Moved Project#protected_branch? to ProtectedBranch, similar for tagsJames Edwards-Jones2017-04-032-5/+5
| | * | | | Extract ProtectedRef ConcernJames Edwards-Jones2017-04-031-8/+3
| | * | | | Added ‘protected’ label and disabled delete button for tags index/showJames Edwards-Jones2017-03-311-1/+1
| | * | | | Protected Tags enforced over gitJames Edwards-Jones2017-03-312-5/+48
* | | | | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-0714-38/+310
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'gitaly-repository-message' into 'master' Sean McGivern2017-04-076-37/+40
| |\ \ \ \ \
| | * | | | | Use Gitlab::Git::Repository#gitaly_... moreJacob Vosmaer2017-04-074-18/+14
| | * | | | | Remove spacesJacob Vosmaer2017-04-071-3/+3
| | * | | | | Remove unused codeJacob Vosmaer2017-04-071-4/+0
| | * | | | | Send more Gitaly::Repository fieldsJacob Vosmaer2017-04-076-25/+36
| * | | | | | Merge branch 'feature/service-desk-be-backport' into 'master' Sean McGivern2017-04-071-1/+5
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Backport permissions and multi-line array to CEFelipe Artur2017-04-071-1/+5
| * | | | | | Add /-/readiness /-/liveness and /-/health_metrics endpoints to track applica...Paweł Chojnacki2017-04-077-0/+265
* | | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-071-1/+17
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Enable polling for pipelines table other pagesToon Claes2017-04-061-0/+12
| * | | | | | In case of Etag cache hit, the body should be emptyToon Claes2017-04-061-1/+1