summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Autofixed some untranslated stringsi18n-copLuke Bennett2019-01-31570-1272/+1277
|
* Added rubocop-i18n to lint untrasnslated stringsLuke Bennett2019-01-283-0/+10
|
* Merge branch 'gt-externalize-app-views-sent_notifications' into 'master'Filipa Lacerda2019-01-233-7/+17
|\ | | | | | | | | Externalize strings from `/app/views/sent_notifications` See merge request gitlab-org/gitlab-ce!24576
| * Externalize strings from `/app/views/sent_notifications`George Tsiolis2019-01-233-7/+17
| |
* | Merge branch '56417-update-helm-to-2-12-2' into 'master'Kamil Trzciński2019-01-234-3/+8
|\ \ | | | | | | | | | | | | | | | | | | Update Helm to 2.12.2 to address Helm client vulnerability Closes #56417 See merge request gitlab-org/gitlab-ce!24418
| * | Update Helm to 2.12.2 to address Helm client vulnerability56417-update-helm-to-2-12-2-ado-testTakuya Noguchi2019-01-184-3/+8
| | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | Merge branch ↵Lin Jen-Shin2019-01-231-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '56731-wait_for_job_to_be_done-gitlab-assets-compile-fails-in-the-review-build-cng-job' into 'master' Resolve "`wait_for_job_to_be_done "gitlab:assets:compile"` fails in the `review-build-cng` job" Closes #56731 See merge request gitlab-org/gitlab-ce!24598
| * | | Set API_TOKEN in the review-build-cng job56731-wait_for_job_to_be_done-gitlab-assets-compile-fails-in-the-review-build-cng-jobRémy Coutable2019-01-231-0/+1
| | |/ | |/| | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch ↵Filipa Lacerda2019-01-2320-63/+65
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25569-changing-wording-to-delete-when-referring-to-removing-a-branch' into 'master' Resolve "Changing wording to "Delete" when referring to removing a branch" Closes #25569 See merge request gitlab-org/gitlab-ce!23966
| * | | Use 'delete' instead of 'remove' for source branch25569-changing-wording-to-delete-when-referring-to-removing-a-branchSam Bigelow2019-01-2220-63/+65
| | | | | | | | | | | | | | | | This is to match `git branch -D <branchname>`
* | | | Merge branch 'docs-slack-troubleshooting' into 'master'Drew Blessing2019-01-231-1/+51
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Add troubleshooting section to Slack Notification Service See merge request gitlab-org/gitlab-ce!24339
| * | | Switch to Rails console scriptCody West2019-01-221-17/+12
| | | | | | | | | | | | | | | | | | | | For the stake of standardizing, I've switched the ssl debugging to use the Rails console rather than a Ruby script file.
| * | | Add script explanationCody West2019-01-221-0/+7
| | | | | | | | | | | | | | | | Offer more explanation regarding the ssl-test script and how it's used.
| * | | Add link to production logCody West2019-01-221-2/+2
| | | |
| * | | Fix sidekiq log linkCody West2019-01-221-1/+1
| | | | | | | | | | | | | | | | Use relative link rather than URL
| * | | Fix typos and wordingCody West2019-01-141-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. fix typo in cacert path 2. fix header to indicate it's an error message 3. add log entry example 4. add sidekiq log link 5. switch "scenario" paragraphs around
| * | | Add troubleshooting sectionCody West2019-01-111-1/+42
| | | | | | | | | | | | | | | | Add troubleshooting section to the slack project integration doc.
* | | | Merge branch 'dm-trim-discussion-truncated-line-first-chars' into 'master'Phil Hughes2019-01-238-24/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix bug that caused Suggestion Markdown toolbar button to insert snippet with leading +/-/<space> See merge request gitlab-org/gitlab-ce!24568
| * | | | Trim first char of diff line text on diff discussionsDouwe Maan2019-01-228-24/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, diff file `higlighted_diff_lines`/`parallel_diff_lines` and diff discussion `truncated_diff_lines` were inconsistent: `text` and `rich_text` on the latter included the leading +/-/<space> character, like on the backend, while the former had no `text` and its `rich_text` had dropped this char. This resulted in a bug when the suggestions feature expected these diff line objects to be identical in format and thus interchangeable, which was not the case.
* | | | | Merge branch 'yoginth-avatar-on-settings-sidebar' into 'master'Phil Hughes2019-01-232-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Avatar in the settings sidebar Closes #56582 See merge request gitlab-org/gitlab-ce!24515
| * | | | | Add Avatar in the settings sidebarYoginth2019-01-232-1/+6
|/ / / / /
* | | | | Merge branch 'fix-review-build-cng-condition' into 'master'Rémy Coutable2019-01-231-9/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All review jobs should share the same only & except Closes #56707 See merge request gitlab-org/gitlab-ce!24579
| * | | | | All review jobs should share the same only & exceptLin Jen-Shin2019-01-231-9/+13
| | | | | |
* | | | | | Merge branch 'docs-serverless-template' into 'master'Evan Read2019-01-231-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix serverless.yml template indentation See merge request gitlab-org/gitlab-ce!24548
| * | | | | | Fix serverless.yml template indentationDaniel Gruesso2019-01-231-3/+3
|/ / / / / /
* | | | | | Merge branch '55979-avoid-installing-bundler-v2-or-higher-docs' into 'master'Evan Read2019-01-2335-35/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid installing Bundler 2.0 or higher on source-based install Closes #55979 See merge request gitlab-org/gitlab-ce!24502
| * | | | | | Avoid installing Bundler 2.0 or higherTakuya Noguchi2019-01-2235-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to always use Bundler 1.x on source install at this moment Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | Merge branch 'mg-fix-bad-cluster-update-entrypoint' into 'master'Clement Ho2019-01-233-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename entrypoint for clusters update/edit page Closes #56715 See merge request gitlab-org/gitlab-ce!24583
| * | | | | | | Add CHANGELOG.md entryMike Greiling2019-01-221-0/+5
| | | | | | | |
| * | | | | | | Rename entrypoint for clusters update/edit pageMike Greiling2019-01-222-0/+0
| | | | | | | |
* | | | | | | | Merge branch 'mg-upgrade-prettier' into 'master'Clement Ho2019-01-223-8/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Upgrade Prettier to v1.16 See merge request gitlab-org/gitlab-ce!24581
| * | | | | | | Upgrade prettier to v1.16.1Mike Greiling2019-01-223-8/+6
|/ / / / / / /
* | | | | | | Merge branch 'mg-upgrade-babel-again' into 'master'Fatih Acet2019-01-222-26/+84
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade babel to v7.3 See merge request gitlab-org/gitlab-ce!24573
| * | | | | | | Upgrade babel to v7.3Mike Greiling2019-01-222-26/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://babeljs.io/blog/2019/01/21/7.3.0
* | | | | | | | Merge branch '52363-add-domain-to-cluster-model' into 'master'Kamil Trzciński2019-01-225-2/+42
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Add domain field into Clusters::Cluster See merge request gitlab-org/gitlab-ce!24368
| * | | | | | | Add domain field into Clusters::ClusterMayra Cabrera2019-01-225-2/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the 1st step for moving Auto DevOps domain into cluster settings, whether is project or group. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/52363
* | | | | | | | Merge branch 'an-opentracing-propagation' into 'master'Kamil Trzciński2019-01-2214-1/+462
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds inter-service OpenTracing propagation See merge request gitlab-org/gitlab-ce!24239
| * | | | | | | | Adds inter-service OpenTracing propagationAndrew Newdigate2019-01-2214-1/+462
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows the GitLab rails and sidekiq components to receive tracing spans from upstream services such as Workhorse and pass these spans on to downstream services including Gitaly and Sidekiq. This change will also emit traces for incoming and outgoing requests using the propagated trace information. This will allow operators and engineers to view traces across the Workhorse, GitLab Rails, Sidekiq and Gitaly components. Additional intra-service instrumentation will be added in future changes.
* | | | | | | | | Merge branch 'fix/56558-move-primary-button' into 'master'Annabel Dunstone Gray2019-01-226-14/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix(labels): Move the primary button out of breadcrumbs and into the project section Closes #56558 See merge request gitlab-org/gitlab-ce!24516
| * | | | | | | | | fix(labels): Move the primary button out of breadcrumbs and into the project ↵Martin Hobert2019-01-226-14/+13
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | section
* | | | | | | | | Merge branch 'gitlab-workhorse-update-8.1.0' into 'master'Nick Thomas2019-01-222-1/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade gitlab-workhorse to 8.1.0 See merge request gitlab-org/gitlab-ce!24571
| * | | | | | | | | Upgrade gitlab-workhorse to 8.1.0Andrew Newdigate2019-01-222-1/+6
|/ / / / / / / / /
* | | | | | | | | Merge branch '56327-improve-localtimeago-rendering' into 'master'Kushal Pandya2019-01-222-58/+74
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve localTimeAgo rendering Closes #56327 See merge request gitlab-org/gitlab-ce!24389
| * | | | | | | | Remove big if-else structure in favor of arrayLukas Eipert2019-01-221-64/+38
| | | | | | | | |
| * | | | | | | | Memoize timeago localesLukas Eipert2019-01-221-38/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each localized function call of the timeago calls gettext 28! times. Even though gettext is rather fast, this escalates pretty quickly. We effectively memoize the locales, which results in a maximum of 28 function calls in total. For pages with normal data, less calls (< 10) are much more realistic.
| * | | | | | | | Remove reference to unused js-timeago-render classLukas Eipert2019-01-222-32/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently the `.js-timeago-render` class serves no real purpose. All functions that used it, directly pass a list of elements. Only one Vue component had an (unnecessary) reference to the class. No styles are applied.
| * | | | | | | | Improved Performance by delaying Tooltip setup for localtimeagoTim Zallmann2019-01-211-8/+18
| | | | | | | | |
* | | | | | | | | Merge branch 'fixes-populate-cluster-kubernetes-namespace-table-spec' into ↵Kamil Trzciński2019-01-222-35/+101
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Removes factories on Cluster background migration See merge request gitlab-org/gitlab-ce!24536
| * | | | | | | | | Removes factories on Cluster background migrationMayra Cabrera2019-01-222-35/+101
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'Populate cluster kubernetes namespace' was using factories for their specs. According to our documentation (see spec/migrations/readme.md), we should use table helper to create a temproary ActiveRecord::Base derived model for a table.
* | | | | | | | | Merge branch '56636-hashed-storage-afterrenameservice' into 'master'Douglas Barbosa Alexandre2019-01-2210-83/+127
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hashed Storage: `AfterRenameService` was not renaming Pages or Uploads folder on legacy storage Closes #56636 See merge request gitlab-org/gitlab-ce!24526
View Lorry Controller Status