summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | added specs for is-active classPhil Hughes2018-06-122-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added spec for openPendingTab in component
| * | | | | | | | | | | | | | more karma fixesPhil Hughes2018-06-123-4/+9
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | karma updatesPhil Hughes2018-06-124-4/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Add active class to active file in IDE commit panelPhil Hughes2018-06-114-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #46051
* | | | | | | | | | | | | | | Merge branch '47735-milestone-regression' into 'master'Phil Hughes2018-06-137-4/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Regressions for assigning group milestone from ancestor" Closes #47735 See merge request gitlab-org/gitlab-ce!19721
| * | | | | | | | | | | | | | | Sidebar Milestone - Fix wrong URL when selecting a parent group milestone47735-milestone-regressionMario de la Ossa2018-06-125-2/+34
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix Banzai reference for milestones belonging to parent groupsMario de la Ossa2018-06-122-2/+10
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch ↵Sean McGivern2018-06-134-8/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '47513-upload-migration-lease-key-is-incorrect-for-non-mounted-uploaders' into 'master' Resolve "Upload migration lease key is incorrect for non-mounted uploaders" Closes #47513 See merge request gitlab-org/gitlab-ce!19600
| * | | | | | | | | | | | | | | | fixed condition checkJan Provaznik2018-06-131-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Override exclusive_lease_key method in RecordsUpload47513-upload-migration-lease-key-is-incorrect-for-non-mounted-uploadersJan Provaznik2018-06-121-6/+10
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Use upload ID instead of model ID in lease keyJan Provaznik2018-06-124-8/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For FileUploaders it's possible that a model has many uploads and if lease key is created only from model id, it causes that the model's uploads can not be migrated in parallel because the exclusive lease key would be same for all uploads of the model.
* | | | | | | | | | | | | | | | | Merge branch 'tz-diff-blob-image-viewer' into 'master'Phil Hughes2018-06-1326-36/+1204
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Image Diff Viewing + Download Diff Viewing See merge request gitlab-org/gitlab-ce!18768
| * | | | | | | | | | | | | | | | | Image Diff Viewing + Download Diff ViewingTim Zallmann2018-06-1326-36/+1204
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch 'docs-link-to-release-post-for-group-issue-board' into 'master'Sean McGivern2018-06-131-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to release post for group issue board docs See merge request gitlab-org/gitlab-ce!19677
| * | | | | | | | | | | | | | | | Link to release post for group issue board docsVictor Wu2018-06-131-1/+3
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'qa-271' into 'master'Rémy Coutable2018-06-1313-44/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve two QA failures Closes gitlab-qa#271 See merge request gitlab-org/gitlab-ce!19655
| * | | | | | | | | | | | | | | Loosen the 'newly created MR' matcherqa-271Rémy Coutable2018-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | | | Ensure we look into the correct setion only when expanding a settings' sectionRémy Coutable2018-06-1312-43/+47
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | Merge branch 'ide-job-loading-empty-state' into 'master'Filipa Lacerda2018-06-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed IDE jobs empty state showing when loading Closes #47766 See merge request gitlab-org/gitlab-ce!19706
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'typo-fix' into 'master'Rémy Coutable2018-06-132-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Typo fix See merge request gitlab-org/gitlab-ce!19720
| * | | | | | | | | | | | | | | | Typo fixRoss Laird2018-06-132-2/+2
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'rails5-fix-47366' into 'master'Rémy Coutable2018-06-132-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5 fix expected `issuable.reload.updated_at` to have changed Closes #47366 See merge request gitlab-org/gitlab-ce!19733
| * | | | | | | | | | | | | | | | Rails5 fix expected `issuable.reload.updated_at` to have changedJasper Maes2018-06-132-0/+10
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'blackst0ne-rails5-update-middlewares' into 'master'Rémy Coutable2018-06-132-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Pass class references instead of strings to middleware builder See merge request gitlab-org/gitlab-ce!19729
| * | | | | | | | | | | | | | | | [Rails5] Pass class references instead of strings to middleware builderblackst0ne-rails5-update-middlewaresblackst0ne2018-06-132-3/+4
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It fixes Rails 5.0 deprecation flooding like: ``` DEPRECATION WARNING: Passing strings or symbols to the middleware builder is deprecated, please change them to actual class references. For example: "::Gitlab::Middleware::ReadOnly" => Gitlab::Middleware::ReadOnly (called from <top (required)> at /builds/gitlab-org/gitlab-ce/config/environment.rb:11) DEPRECATION WARNING: Passing strings or symbols to the middleware builder is deprecated, please change them to actual class references. For example: "ActionDispatch::Static" => ActionDispatch::Static (called from <top (required)> at /builds/gitlab-org/gitlab-ce/config/environment.rb:11) DEPRECATION WARNING: Passing strings or symbols to the middleware builder is deprecated, please change them to actual class references. For example: "Gitlab::Testing::RequestBlockerMiddleware" => Gitlab::Testing::RequestBlockerMiddleware (called from <top (required)> at /builds/gitlab-org/gitlab-ce/config/environment.rb:11) DEPRECATION WARNING: Passing strings or symbols to the middleware builder is deprecated, please change them to actual class references. For example: "ActionDispatch::Static" => ActionDispatch::Static (called from <top (required)> at /builds/gitlab-org/gitlab-ce/config/environment.rb:11) DEPRECATION WARNING: Passing strings or symbols to the middleware builder is deprecated, please change them to actual class references. For example: "Gitlab::Testing::RequestInspectorMiddleware" => Gitlab::Testing::RequestInspectorMiddleware (called from <top (required)> at /builds/gitlab-org/gitlab-ce/config/environment.rb:11) ```
* | | | | | | | | | | | | | | | Merge branch '47408-migrateuploadsworker-is-doing-n-1-queries-on-migration' ↵Sean McGivern2018-06-137-26/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "`MigrateUploadsWorker` is doing N+1 queries on migration" Closes #47408 See merge request gitlab-org/gitlab-ce!19547
| * | | | | | | | | | | | | | | apply feedback47408-migrateuploadsworker-is-doing-n-1-queries-on-migrationMicaël Bergeron2018-06-122-21/+16
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | apply feedbackMicaël Bergeron2018-06-082-4/+13
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix the failing specMicaël Bergeron2018-06-073-5/+6
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | added changelogMicaël Bergeron2018-06-071-0/+5
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | shave off another 20% queryMicaël Bergeron2018-06-073-6/+6
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | shave off 30% of the query countMicaël Bergeron2018-06-063-14/+53
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'zj-compare-source-branch' into 'master'Sean McGivern2018-06-131-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate compare_source_branch to use only Gitaly Closes gitaly#771 See merge request gitlab-org/gitlab-ce!19700
| * | | | | | | | | | | | | | | | Migrate compare_source_branch to use only GitalyZeger-Jan van de Weg2018-06-121-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initially expected this to be a full blown migration, but that wasn't the case as we could fetch to a reference that would be deleted after the instanciation of the Diff object. This is a racy RPC, as #delete_refs is called and garbage collections runs right than, the commit can't be found later. Closes https://gitlab.com/gitlab-org/gitaly/issues/771
* | | | | | | | | | | | | | | | | Merge branch 'fj-restore-users-v3-endpoint' into 'master'Douwe Maan2018-06-134-49/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restoring user v3 endpoint Closes #47565 See merge request gitlab-org/gitlab-ce!19661
| * | | | | | | | | | | | | | | | | Restoring user v3 endpointFrancisco Javier López2018-06-134-49/+65
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch '42342-teams-pipeline-notifications' into 'master'Douwe Maan2018-06-137-9/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Microsoft Teams notification for pipelines do not work" Closes #42342 See merge request gitlab-org/gitlab-ce!19632
| * | | | | | | | | | | | | | | | Fixes Microsoft Teams notifications for pipeline eventsJeff Brown2018-06-127-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #42342
* | | | | | | | | | | | | | | | | Merge branch 'commits_api_with_stats' into 'master'Rémy Coutable2018-06-137-11/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added with_stats option to GET /projects/:id/repository/commits (API) See merge request gitlab-org/gitlab-ce!19484
| * | | | | | | | | | | | | | | | | Added with_statsoption for GET /projects/:id/repository/commitsLeonid Batizhevskii2018-06-127-11/+60
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '44674-use-one-column-form-layout-on-admin-area-settings-page' ↵Phil Hughes2018-06-1330-769/+663
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Use one column form layout on Admin Area Settings page" Closes #44674 See merge request gitlab-org/gitlab-ce!19673
| * | | | | | | | | | | | | | | | | Resolve "Use one column form layout on Admin Area Settings page"Dennis Tang | OOO until 18.062018-06-1330-769/+663
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge branch '46702-groups-members-no-padding-between-dropdowns-input' into ↵Annabel Gray2018-06-133-10/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Groups > Members > No padding between dropdowns/input" Closes #46702 See merge request gitlab-org/gitlab-ce!19724
| * | | | | | | | | | | | | | | | Fix group member filter layout46702-groups-members-no-padding-between-dropdowns-inputClement Ho2018-06-123-10/+8
| | |_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch ↵Annabel Gray2018-06-121-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '47551-participants-tooltip-is-cutoff-when-too-close-to-the-window-edge' into 'master' Resolve "Participants tooltip is cutoff when too close to the window edge" Closes #47551 See merge request gitlab-org/gitlab-ce!19669
| * | | | | | | | | | | | | | | Resolve "Participants tooltip is cutoff when too close to the window edge"Clement Ho2018-06-121-0/+1
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch '47773-search-bar' into 'master'Clement Ho2018-06-121-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project search in navbar is missing top margin in dev.gitlab.com" Closes #47773 See merge request gitlab-org/gitlab-ce!19718
| * | | | | | | | | | | | | | | Align nav bar itemsAnnabel Dunstone Gray2018-06-121-0/+2
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'sh-update-unicorn-rb-example' into 'master'Robert Speicher2018-06-121-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up stale Prometheus metrics in before_exec unicorn hook See merge request gitlab-org/gitlab-ce!19683
| * | | | | | | | | | | | | | | Clean up stale Prometheus metrics in before_exec unicorn hooksh-update-unicorn-rb-exampleStan Hu2018-06-111-0/+11
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issuing a SIGUSR2 to a unicorn involves a dance where new workers are spun up before the old ones are shut down. To ensure Prometheus .db files aren't deleted after the new workers are shut down, we need to clean these files up before the unicorn process is run. Relates to https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/2582