summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'add-project-permissions' into 'master' Dmitriy Zaporozhets2015-12-231-3/+3
|\
| * Add project permissions to all project API endpointsStan Hu2015-12-221-3/+3
* | Merge branch 'fix/ci-runners-token-persistence' into 'master' Grzegorz Bizon2015-12-231-1/+1
|\ \
| * | Use method that creates runners registration tokenGrzegorz Bizon2015-12-231-1/+1
| |/
* | emoji picker: minor fixesValery Sizov2015-12-221-8/+0
* | base implementation of emoji picker [ci skip]Valery Sizov2015-12-221-9/+40
|/
* Merge branch 'tduehr/gitlab-ce-cas-support'Douwe Maan2015-12-211-0/+17
|\
| * add CAS authentication supporttduehr2015-12-141-0/+17
* | Merge branch 'git-version' into 'master' Douwe Maan2015-12-211-0/+4
|\ \
| * | Show git version on admin pageTrey Davis2015-12-151-0/+4
| |/
* | Backport JIRA serviceDrew Blessing2015-12-182-4/+28
* | Merge branch 'api-support-starred-projects' into 'master' Dmitriy Zaporozhets2015-12-161-0/+11
|\ \
| * | Api support for requesting starred projects for userZeger-Jan van de Weg2015-12-161-0/+11
* | | Merge branch 'fix_rubocop' into 'master' Robert Speicher2015-12-161-1/+1
|\ \ \ | |/ / |/| |
| * | Fix Rubocop complain.fix_rubocopRubén Dávila2015-12-161-1/+1
* | | Merge branch 'disable-markdown-cache' into 'master' Douwe Maan2015-12-161-1/+3
|\ \ \ | |/ / |/| |
| * | Temporarily disable Markdown cachingDouwe Maan2015-12-161-1/+3
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-12-164-292/+6
|\ \ \ | |/ /
| * | Merge branch 'workhorse-passthrough' into 'master' Kamil Trzciński2015-12-164-292/+6
| |\ \
| | * \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into workhorse-passt...Jacob Vosmaer2015-12-1523-352/+162
| | |\ \ | | | |/
| | * | Update init script options for gitlab-workhorseJacob Vosmaer2015-12-152-2/+3
| | * | Pass all requests from NGINX to gitlab-workhorseJacob Vosmaer2015-12-112-290/+3
* | | | Merge branch 'add-open-issues-count-to-api' of https://gitlab.com/stanhu/gitl...Dmitriy Zaporozhets2015-12-161-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Add open_issues_count to project APIStan Hu2015-12-111-0/+1
* | | | Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets2015-12-1613-16/+21
|\ \ \ \
| * | | | Fixed Rubocop offensesGabriel Mazetto2015-12-1513-16/+21
| | |_|/ | |/| |
* | | | Merge branch 'lazy-reference-extractor' into 'master' Robert Speicher2015-12-1554-421/+471
|\ \ \ \
| * | | | Use lazy reference extractor to get issue's MRslazy-reference-extractorDouwe Maan2015-12-151-1/+1
| * | | | Move Markdown/reference logic from Gitlab::Markdown to BanzaiDouwe Maan2015-12-1554-421/+471
| |/ / /
* | | | Merge branch 'add_user_repo_integrity_rake_task' into 'master' Robert Speicher2015-12-151-4/+52
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip] Add user repository integrity check rake taskDrew Blessing2015-12-141-4/+52
| | |/ | |/|
* | | Merge branch 'master' into ci/persist-registration-tokenGrzegorz Bizon2015-12-1426-376/+368
|\ \ \
| * \ \ Merge branch 'ci-project-migrate' into 'master' Kamil Trzciński2015-12-1420-310/+69
| |\ \ \
| | * | | Use Gitlab::Git instead of Ci::GitKamil Trzcinski2015-12-111-5/+0
| | * | | Fix specsKamil Trzcinski2015-12-111-1/+1
| | * | | Fix after column renameKamil Trzcinski2015-12-111-9/+0
| | * | | Fix triggers testsKamil Trzcinski2015-12-111-1/+1
| | * | | Reimplement Trigger APIKamil Trzcinski2015-12-113-0/+53
| | * | | Remove ci_ prefix from all ci related thingsKamil Trzcinski2015-12-112-3/+3
| | * | | Add runners tokenKamil Trzcinski2015-12-114-7/+3
| | * | | Migrate CI::Project to ProjectKamil Trzcinski2015-12-1115-295/+19
| * | | | Merge branch 'ci-services-migrate' into 'master' Kamil Trzciński2015-12-145-40/+87
| |\ \ \ \ | | |/ / /
| | * | | Migrate CI WebHooks and Emails to new tablesKamil Trzcinski2015-12-101-0/+18
| | * | | Migrate CI::Services and CI::WebHooks to Services and WebHooksKamil Trzcinski2015-12-104-40/+69
| * | | | Bump Redis requirement to 2.8 for Sidekiq 4 requirementsStan Hu2015-12-121-1/+1
| | |/ / | |/| |
| * | | Merge branch 'complexity/rubocop-metrics' into 'master' Douwe Maan2015-12-112-26/+177
| |\ \ \
| | * | | Mix url helpers in into `RepositoryPush`Grzegorz Bizon2015-12-111-9/+10
| | * | | Refactor CI YAML processor's validatorsGrzegorz Bizon2015-12-081-26/+40
| | * | | Check if commits are available in `RepositoryPush`Grzegorz Bizon2015-12-081-3/+3
| | * | | Duplicate options in `RepositoryPush`Grzegorz Bizon2015-12-081-4/+4
View Lorry Controller Status