summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Prepare Repository#merge for migration to Gitalyoperation-service-mergeJacob Vosmaer2017-09-152-1/+43
|
* Merge branch 'gitlab-git-user' into 'master'Rémy Coutable2017-09-143-18/+24
|\ | | | | | | | | Rename Gitlab::Git::Committer to User See merge request gitlab-org/gitlab-ce!14254
| * Rename Gitlab::Git::Committer to UserJacob Vosmaer2017-09-143-18/+24
| |
* | Merge branch '37845-fix-oauth-provider-forced-encoding' into 'master'Grzegorz Bizon2017-09-141-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Don't force the encoding of the OAuth provider in Gitlab::OAuth::AuthHash#provider Closes #37845 See merge request gitlab-org/gitlab-ce!14263
| * | Don't force the encoding of the OAuth provider in ↵37845-fix-oauth-provider-forced-encodingRémy Coutable2017-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::OAuth::AuthHash#provider Some providers freeze their name (e.g. https://github.com/zquestz/omniauth-google-oauth2/blob/414c43ef3ffec37d473321f262e80f1e46dda89f/lib/omniauth/strategies/google_oauth2.rb#L1), so trying to modify the string would fail with a `can't modify frozen String` exception (see https://gitlab.com/gitlab-org/gitlab-ce/issues/37845#note_40308148). In this case, we can just stop trying to force the encoding of the provider name as they should always be in utf8 by default. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch ↵Douwe Maan2017-09-141-1/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | '37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-header' into 'master' Resolve "Renamed files have escaped HTML for the inline diff in the header" Closes #37576 See merge request gitlab-org/gitlab-ce!14121
| * | changed InlineDiffMarker to make it html_safe its output37576-renamed-files-have-escaped-html-for-the-inline-diff-in-the-headermicael.bergeron2017-09-121-1/+2
| | | | | | | | | | | | updated the spec
* | | Merge branch 'backport-ee-changes-to-url-sanitizer' into 'master'Rémy Coutable2017-09-131-4/+21
|\ \ \ | |_|/ |/| | | | | | | | Backport more EE changes to Gitlab::UrlSanitizer See merge request !14150
| * | 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 usage ping for Auto DevOps Closes #37648 See merge request !14162
| * | | 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
| | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#37648
* | | | Merge branch '5836-move-lib-ci-into-gitlab-namespace' into 'master'Grzegorz Bizon2017-09-136-2/+731
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Move `lib/ci` to `lib/gitlab/ci`" Closes #5836 See merge request !14078
| * | | | adds changelogMaxim Rydkin2017-09-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix CI fix CI
| * | | | 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'" See merge request !14190
| * | | | Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-111-0/+84
| | |/ / | |/| | | | | | This reverts merge request !14148
* | | | 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 Gitaly Closes gitaly#519 See merge request !14077
| * | | | 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 Dashboard Closes #36953 See merge request !14040
| * | | | 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 instance See merge request !13314
| * | | 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' ↵Kamil Trzciński2017-09-111-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Backport the EE signature of Gitlab::Workhorse#send_artifacts_entry See merge request !14144
| * | | | Backport the EE signature of Gitlab::Workhorse#send_artifacts_entryrc/backport-workhorse-send_artifacts_entry-signature-from-eeRémy Coutable2017-09-081-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Revert "Merge branch ↵revert-f2421b2bRubén Dávila2017-09-081-84/+0
|/ / / / | | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619
* | | | Merge branch 'dm-go-get-xss' into 'security-9-3'Robert Speicher2017-09-071-10/+23
| |/ / |/| | | | | | | | | | | Fix XSS issue in go-get handling See merge request !2128
* | | Merge branch ↵Douwe Maan2017-09-071-2/+8
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | '35558-only-one-garbage-collection-should-be-running-per-project-at-once' into 'master' Adds exclusive lease to Git garbage collect worker. Closes #35558 See merge request !14036
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add JSON logger in `log/api_json.log` for Grape API endpoints Closes #36189 See merge request !14102
| * | | 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
| |/ / | | | | | | | | | Closes #36189
* | | Gitaly feature toggles are on by default in development environmentsAndrew Newdigate2017-09-071-8/+28
| | |
* | | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-09-074-2/+86
|\ \ \ | | | | | | | | | | | | zj/gitlab-ce-zj-auto-devops-table
| * \ \ Merge branch ↵Sean McGivern2017-09-071-0/+84
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master' Add option to change navigation color palette Closes #35012 See merge request !13619
| | * | | 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
| | |/ /
View Lorry Controller Status