summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'refactor-artifact-api-endpoint' into 'master'Grzegorz Bizon2019-01-093-23/+13
|\ | | | | | | | | | | | | Refactor artifact api endpoint Closes #55445 See merge request gitlab-org/gitlab-ce!23582
| * Create `get_build` for project modelSteve Azzopardi2019-01-073-7/+7
| | | | | | | | | | | | | | | | Inside of `Projects::ArtifactsController` and `Projects::BuildArtifactsController` we fetching the build by id using active record directly which violates `CodeReuse/ActiveRecord` rubocop rule. Create `get_build` inside of `project` model which does the same thing.
| * Refactor project.latest_successful_builds_for defSteve Azzopardi2019-01-073-17/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `project.latest_successful_builds_for(ref)` is being used to find a single job all the time. This results into us having to call `find_by` inside of the controller which violates our CodeReuse/ActiveRecord rubocop rule. Refactor `project.latest_successful_builds_for(ref)` to `project.latest_successful_build_for(job_name, ref)` which will execute the `find_by` inside of the model. Also create `project.latest_successful_build_for!(job_name, ref)` which raises an exception instead of returning nil.
* | Merge branch 'ce-extract-specific-code-from-project_snippet_policy' into ↵Nick Thomas2019-01-092-6/+9
|\ \ | | | | | | | | | | | | | | | | | | 'master' Make ProjectSnippetPolicy EE-ready See merge request gitlab-org/gitlab-ce!23908
| * | Make ProjectSnippetPolicy EE-readyce-extract-specific-code-from-project_snippet_policyRémy Coutable2019-01-072-6/+9
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'fix-auto-devops-domain-title-on-admin-settings' into 'master'Stan Hu2019-01-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fixes Auto DevOps Domain title on admin settings See merge request gitlab-org/gitlab-ce!24249
| * | | Fixes Auto DevOps Domain title on admin settingsMayra Cabrera2019-01-081-1/+1
| | | | | | | | | | | | | | | | Changes "Auto devops" to "Auto DevOps" on CI/CD admin settings
* | | | Merge branch 'sh-revert-mr-23135' into 'master'Robert Speicher2019-01-081-10/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '3062-improve-project-cache' into 'master'" Closes #56103 See merge request gitlab-org/gitlab-ce!24244
| * | | | Revert "Merge branch '3062-improve-project-cache' into 'master'"Stan Hu2019-01-081-10/+2
| |/ / / | | | | | | | | | | | | | | | | This reverts commit e65e184269bb27661c9a20658933e8482aa90b62, reversing changes made to 646ba2418b630710edeaac94b57d08adf2771257.
* | | | Fix MR sidebar to correctly warning if assignee can't mergeDouglas Barbosa Alexandre2019-01-081-1/+1
|/ / /
* | | Merge branch ↵Annabel Dunstone Gray2019-01-082-16/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '56010-user-profile-page-horizonal-whitespace-between-overview-columns-breaks-two-column-layout' into 'master' Resolve "User profile page: Horizonal whitespace between Overview columns breaks two column layout" Closes #56010 See merge request gitlab-org/gitlab-ce!24189
| * | | Remove horizontal whitespace on user profile page for small breakpointsMartin Wortschack2019-01-072-16/+24
| | | |
* | | | Merge branch '6861-group-level-project-templates-QA-tests-take-2-ce' into ↵Mark Lapierre2019-01-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' CE port of "e2e QA tests for Group level project templates" See merge request gitlab-org/gitlab-ce!23987
| * | | | CE port of EE MR6861-group-level-project-templates-QA-tests-take-2-ceSanad Liaquat2019-01-081-1/+1
| | | | |
* | | | | Merge branch 'kp-7325-add-lib-helpers' into 'master'Fatih Acet2019-01-082-10/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE Backport: Add library helpers to use in Roadmap See merge request gitlab-org/gitlab-ce!24232
| * | | | | Add `newDate` helper, update `getTimeframeWindowFrom`Kushal Pandya2019-01-081-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds `newDate` helper to copy date object without keeping reference. Adds negative length support in `getTimeframeWindowFrom` to go back in time.
| * | | | | Add support for `offset` values in `isInViewport`Kushal Pandya2019-01-081-3/+4
| | | | | |
* | | | | | Merge branch 'mr-widget-conflicts-protected-branch' into 'master'Nick Thomas2019-01-084-9/+74
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable resolve conflicts for protected branches Closes #53463 See merge request gitlab-org/gitlab-ce!23842
| * | | | | | Disable resolve conflicts for protected branchesPhil Hughes2019-01-074-9/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53463
* | | | | | | Add feature spec for Release page MVCShinya Maeda2019-01-081-1/+1
| | | | | | |
* | | | | | | Merge branch '56076-releases-margin' into 'master'Phil Hughes2019-01-081-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes missing margin in releases block Closes #56076 See merge request gitlab-org/gitlab-ce!24229
| * | | | | | | Fixes missing margin in releases blockFilipa Lacerda2019-01-081-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'mr-file-tree-blob-truncate-improvements' into 'master'Filipa Lacerda2019-01-086-45/+95
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add headers to files in the tree list on merge requests Closes #54807 See merge request gitlab-org/gitlab-ce!23954
| * | | | | | | Add headers to files in the tree list on merge requestsPhil Hughes2019-01-086-45/+95
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54807
* | | | | | | Merge branch ↵Kushal Pandya2019-01-081-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '8775-track-import-issues-csv-usage-on-gitlab-com-with-snowplow' into 'master' CE backport of "Track export issues CSV usage on GitLab.com with Snowplow" See merge request gitlab-org/gitlab-ce!24217
| * | | | | | Backport of "Track export issues CSV usage on GitLab.com with Snowplow"Constance Okoghenun2019-01-081-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9067
* | | | | | Merge branch 'remove-comma' into 'master'Kushal Pandya2019-01-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove comma from issuable email See merge request gitlab-org/gitlab-ce!24218
| * | | | | | Remove comma from issuable emailRajat Jain2019-01-081-1/+1
| |/ / / / /
* | | | | | Fixes z-index and margins of archived alertFilipa Lacerda2019-01-082-4/+9
|/ / / / /
* | | | | Merge branch '3845-committers-cannot-approve-mr-ce' into 'master'Douwe Maan2019-01-082-7/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add committers and authors methods on MergeRequest See merge request gitlab-org/gitlab-ce!24204
| * | | | | Add committers and authors methods on MergeRequestTiago Botelho2019-01-082-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | These are used by the EE-only approvers feature
* | | | | | Merge branch 'ce-5606-issues-and-mr-autocomplete-in-epics' into 'master'Robert Speicher2019-01-081-9/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport of gitlab-ee!8936 See merge request gitlab-org/gitlab-ce!23976
| * | | | | | CE backport for `reference` in gfm_autocompletece-5606-issues-and-mr-autocomplete-in-epicsHeinrich Lee Yu2019-01-071-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently not used by any CE code
* | | | | | | Merge branch '53966-hashed-storage-read-only' into 'master'Douglas Barbosa Alexandre2019-01-082-3/+37
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Hashed Storage: Only set as `read_only` when starting the per-project migration See merge request gitlab-org/gitlab-ce!24128
| * | | | | | Only set as `read_only` when starting the per-project migration53966-hashed-storage-read-onlyGabriel Mazetto2019-01-072-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the previous code, we locked the project during the migration scheduling step, which works fine for small setups, but can be problematic in really big installations. We now moved the logic to inside the worker, so we minimize the time a project will be read-only. We also make sure we only do that if reference counter is `0` (no current operation is in progress).
* | | | | | | Merge branch '49231-import-issues-csv' into 'master'Douwe Maan2019-01-0722-24/+268
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import issues from CSV Closes #49231 See merge request gitlab-org/gitlab-ce!23532
| * | | | | | | Remove caching of CSV file49231-import-issues-csvHeinrich Lee Yu2019-01-076-25/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load whole file in memory to simplify code
| * | | | | | | Improve email messagesHeinrich Lee Yu2019-01-077-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also refactored cleanup view to use the same localized string
| * | | | | | | Refactor upload service to return uploaderHeinrich Lee Yu2019-01-073-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also changes old calls to the service
| * | | | | | | Import CSV BackendHeinrich Lee Yu2019-01-0712-12/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Process CSV uploads async using a worker then email results
| * | | | | | | Add Import CSV FrontendHeinrich Lee Yu2019-01-0712-53/+137
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Added button and modal to accept CSV file for uploading
* | | | | | | Externalize strings from `/app/views/shared/notes`George Tsiolis2019-01-077-35/+30
| | | | | | |
* | | | | | | Merge branch 'ce-7407-label-quick-epics' into 'master'Lin Jen-Shin2019-01-073-15/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port: Use parent instead of project for quick actions See merge request gitlab-org/gitlab-ce!24124
| * | | | | | | Use parent instead of projectJarka Košanová2019-01-083-15/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for group entities to quick actions
* | | | | | | | Merge branch '55177-sentry-configuration' into 'master'Kamil Trzciński2019-01-076-3/+44
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Sentry Configuration" See merge request gitlab-org/gitlab-ce!23724
| * | | | | | | | Implement error tracking configurationPeter Leitzen2019-01-074-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-use operations controller which already handles tracing settings.
| * | | | | | | | Add error tracking setting partialPeter Leitzen2019-01-072-0/+31
| | | | | | | | |
| * | | | | | | | Add view and feature test for error tracking settingsTristan Read2019-01-071-0/+1
| |/ / / / / / /
* | | | | | | | Add threshold lines in metrics graphAdriel Santiago2019-01-072-4/+13
|/ / / / / / /
* | | | | | | Add table and model for error tracking settingsReuben Pereira2019-01-073-1/+18
| |_|_|_|/ / |/| | | | |
View Lorry Controller Status