summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'backport-ee-changes-to-url-sanitizer' into 'master'Rémy Coutable2017-09-131-4/+21
|\
| * Backport more EE changes to Gitlab::UrlSanitizerNick Thomas2017-09-111-4/+21
* | Fix: GPG tmp dir removal race conditionAlexis Reigel2017-09-131-4/+10
* | Merge branch 'zj-usage-data-auto-devops' into 'master'Kamil Trzciński2017-09-131-0/+4
|\ \
| * | Add auto devops enabled/disabled to usage pingZeger-Jan van de Weg2017-09-121-0/+2
| * | Add usage ping for Auto DevOpsZeger-Jan van de Weg2017-09-081-0/+2
* | | Merge branch '5836-move-lib-ci-into-gitlab-namespace' into 'master'Grzegorz Bizon2017-09-136-2/+731
|\ \ \
| * | | adds changelogMaxim Rydkin2017-09-121-4/+4
| * | | move `lib/ci/mask_secret.rb` into `lib/gitlab/ci/mask_secret.rb`Maxim Rydkin2017-09-121-0/+12
| * | | move `lib/ci/gitlab_ci_yaml_processor.rb` into `lib/gitlab/ci/yaml_processor.rb`Maxim Rydkin2017-09-121-0/+253
| * | | move `lib/ci/model.rb` into `lib/gitlab/ci/model.rb`Maxim Rydkin2017-09-121-0/+13
| * | | move `lib/ci/charts.rb` into `lib/gitlab/ci/charts.rb`Maxim Rydkin2017-09-121-0/+118
| * | | move `lib/ci/ansi2html.rb` into `lib/gitlab/ci/ansi2html.rb`Maxim Rydkin2017-09-122-2/+335
* | | | Merge branch 'revert-2f46c3a8' into 'master'Robert Speicher2017-09-121-0/+84
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-111-0/+84
| | |/ | |/|
* | | Decrease Cyclomatic Complexity threshold to 13Maxim Rydkin2017-09-122-19/+36
* | | Merge branch 'gitaly-519-commit-stats' into 'master'Robert Speicher2017-09-123-2/+27
|\ \ \
| * | | Migrate Git::CommitStats to Gitalygitaly-519-commit-statsKim "BKC" Carlbäcker2017-09-113-2/+27
| |/ /
* | | Resolve "Error 500 in non-UTF8 branch names"Micael Bergeron2017-09-121-1/+1
* | | Merge branch '36953-add-gitLab-pages-version-to-admin-dashboard' into 'master'Rémy Coutable2017-09-121-0/+5
|\ \ \
| * | | Add GitLab-Pages version to Admin DashboardTravis Miller2017-09-071-0/+5
| | |/ | |/|
* | | Merge branch 'hide-read-registry-scope-when-registry-disabled' into 'master'Kamil Trzciński2017-09-121-1/+1
|\ \ \ | |_|/ |/| |
| * | Hide read_registry scope when registry is disabled on instanceRobin Bobbitt2017-08-211-1/+1
* | | Merge branch 'rc/backport-workhorse-send_artifacts_entry-signature-from-ee' i...Kamil Trzciński2017-09-111-2/+2
|\ \ \
| * | | Backport the EE signature of Gitlab::Workhorse#send_artifacts_entryrc/backport-workhorse-send_artifacts_entry-signature-from-eeRémy Coutable2017-09-081-2/+2
* | | | Revert "Merge branch '35012-navigation-add-option-to-change-navigation-color-...revert-f2421b2bRubén Dávila2017-09-081-84/+0
|/ / /
* | | Merge branch 'dm-go-get-xss' into 'security-9-3'Robert Speicher2017-09-071-10/+23
| |/ |/|
* | Merge branch '35558-only-one-garbage-collection-should-be-running-per-project...Douwe Maan2017-09-071-2/+8
|\ \
| * | Adds exclusive lease to Git garbage collect worker.35558-only-one-garbage-collection-should-be-running-per-project-at-onceTiago Botelho2017-09-071-2/+8
* | | Merge branch 'sh-add-grape-logging' into 'master'Sean McGivern2017-09-071-0/+19
|\ \ \
| * | | Use a custom GrapeLogging formatter to get the timestampsh-add-grape-loggingStan Hu2017-09-072-7/+19
| * | | Fix Rubocop failures in API loggerStan Hu2017-09-071-1/+0
| * | | Add JSON logger in `log/api_json.log` for Grape API endpointsStan Hu2017-09-061-0/+8
| |/ /
* | | Gitaly feature toggles are on by default in development environmentsAndrew Newdigate2017-09-071-8/+28
* | | Merge remote-tracking branch 'origin/master' into zj/gitlab-ce-zj-auto-devops...Kamil Trzcinski2017-09-074-2/+86
|\ \ \
| * \ \ Merge branch '35012-navigation-add-option-to-change-navigation-color-palette'...Sean McGivern2017-09-071-0/+84
| |\ \ \
| | * | | Small refactor after last code review.35012-navigation-add-option-to-change-navigation-color-paletteRuben Davila2017-09-071-6/+4
| | * | | Use indigo as default themeAnnabel Dunstone Gray2017-09-071-1/+1
| | * | | Add previews in preferencesAnnabel Dunstone Gray2017-09-061-1/+1
| | * | | Fix specs; start on light themeAnnabel Dunstone Gray2017-09-061-1/+3
| | * | | Add blue themeAnnabel Dunstone Gray2017-09-061-1/+2
| | * | | Add functionality for two themesAnnabel Dunstone Gray2017-09-061-6/+2
| | * | | Restore some changes from !9199Rubén Dávila2017-09-061-0/+87
| | |/ /
| * | | Merge branch 'events-migration-cleanup' into 'master'Sean McGivern2017-09-072-2/+1
| |\ \ \
| | * | | Finish migration to the new events setupevents-migration-cleanupYorick Peterse2017-09-062-2/+1
| * | | | Merge branch 'ee_issue_928_backport' into 'master'Sean McGivern2017-09-071-0/+1
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ee_issue_928_ba...Simon Knox2017-09-0656-166/+1267
| | |\ \ \ \ | | | |/ / /
| | * | | | Fix specs BACKPORTFelipe Artur2017-09-041-0/+1
* | | | | | Merge branch 'master' into zj-auto-devops-tablezj/gitlab-ce-zj-auto-devops-tableZeger-Jan van de Weg2017-09-072-7/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Implement fix for n+1 issue on `flatten_tree` helpergitaly-tree-entries-fixAlejandro Rodríguez2017-09-062-7/+10
| | |_|/ / | |/| | |