summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fixes stylelint for page_title.scss59873-page-titleFilipa Lacerda2019-04-1211-13/+10
| | | | Replaces CSS with BS4 Utility classes
* Merge branch 'diff-fluid-layout-fix' into 'master'Kushal Pandya2019-04-123-2/+10
|\ | | | | | | | | | | | | Fixed fluid layout preference not being respected in diffs Closes #52916 See merge request gitlab-org/gitlab-ce!27302
| * Fixed fluid layout preference not being respected in diffsPhil Hughes2019-04-123-2/+10
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52916
* | Merge branch '60261-save-btn-env' into 'master'Kushal Pandya2019-04-121-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fixes white background in the save button for environments Closes #60261 See merge request gitlab-org/gitlab-ce!27161
| * | Updates Save button to have a green bg60261-save-btn-envFilipa Lacerda2019-04-091-1/+1
| | | | | | | | | | | | | | | The Save button in the environments create/edit form was white, it should be green.
* | | Merge branch '60224-btn-env' into 'master'Kushal Pandya2019-04-121-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Removes extra btn class from dropdown Closes #60224 See merge request gitlab-org/gitlab-ce!27160
| * | Removes extra btn class from dropdown60224-btn-envFilipa Lacerda2019-04-091-1/+1
| |/ | | | | | | | | In the deployments page, the links inside a dropdown had an extra btn class
* | Merge branch '59896-builds-css' into 'master'Phil Hughes2019-04-125-47/+18
|\ \ | | | | | | | | | | | | | | | | | | Fixes stylelint issues for builds.scss Closes #59896 See merge request gitlab-org/gitlab-ce!27279
| * | Fixes stylelint issues for builds.scss59896-builds-cssFilipa Lacerda2019-04-115-47/+18
| | | | | | | | | | | | | | | Replaces CSS with utility classes Removes unused CSS
* | | Merge branch 'remove-extend-fixed-width' into 'master'Phil Hughes2019-04-121-8/+3
|\ \ \ | | | | | | | | | | | | | | | | Include fixed-width mixin instead of extending the class See merge request gitlab-org/gitlab-ce!27277
| * | | Include fixed-width mixin instead of extending the classremove-extend-fixed-widthAnnabel Dunstone Gray2019-04-111-8/+3
| | | |
* | | | Squashed commits and modified visibility level outputSara Ahbabou2019-04-121-1/+5
| | | | | | | | | | | | | | | | Added changelog and rebased
* | | | Merge branch ↵Fatih Acet2019-04-111-1/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '10015-move-ee-differences-for-app-assets-javascripts-boards-models-milestone-js' into 'master' Backport of "Move EE differences for `app/assets/javascripts/boards/models/milestone.js`" See merge request gitlab-org/gitlab-ce!27272
| * | | | Backport of EE changes to board milestone model10015-move-ee-differences-for-app-assets-javascripts-boards-models-milestone-jsConstance Okoghenun2019-04-111-1/+10
| | |/ / | |/| |
* | | | Update project settings qa selectorsSanad Liaquat2019-04-114-29/+8
| | | | | | | | | | | | | | | | Additionally fixes geo rename test.
* | | | Improve project settings pageLuke Bennett2019-04-1110-245/+253
| | | | | | | | | | | | | | | | Prioritize and simplify project settings content.
* | | | Merge branch '60304-long-file-names-in-mr-diffs-cause-horizontal-scrolling' ↵Annabel Dunstone Gray2019-04-111-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Long file names in MR diffs cause horizontal scrolling" Closes #60304 See merge request gitlab-org/gitlab-ce!27233
| * | | Only make margin-auto on large screens for diff file header60304-long-file-names-in-mr-diffs-cause-horizontal-scrollingSam Bigelow2019-04-101-1/+1
| | | |
* | | | Merge branch 'restore-hipchat' into 'master'Nick Thomas2019-04-113-0/+313
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Revert "Remove HipChat integration from GitLab" Closes #60042 See merge request gitlab-org/gitlab-ce!27172
| * | | Revert "Remove HipChat integration from GitLab"Sean McGivern2019-04-103-0/+313
| | | | | | | | | | | | | | | | This reverts commit a5378665a1dc0b9c8dc3a4fa279a0eb78aac5aac.
* | | | Merge branch 'fixed-web-ide-merge-request-review' into 'master'Kushal Pandya2019-04-111-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Web IDE not loading merge request files Closes #60243 See merge request gitlab-org/gitlab-ce!27225
| * | | | Fixes Web IDE not loading merge request filesPhil Hughes2019-04-111-0/+3
| | |/ / | |/| | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60243
* | | | Merge branch 'revert-24704-download-repository-path' into 'master'Rémy Coutable2019-04-116-35/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Revert "Merge branch '24704-download-repository-path' into 'master'" See merge request gitlab-org/gitlab-ce!27249
| * | | | Revert "Merge branch '24704-download-repository-path' into 'master'"revert-24704-download-repository-pathPatrick Bajao2019-04-116-35/+27
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6c75bd015cba181f028bc87c396c3d8e43b5dc3e, reversing changes made to 1be7f5aaa38aba79843eae8835be6c99c025e982.
* | | | | Merge branch '60278-fix-development-seed' into 'master'Douwe Maan2019-04-112-3/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ApplicationSetting development seed Closes #60278 See merge request gitlab-org/gitlab-ce!27213
| * | | | | Fix ApplicationSetting development seed60278-fix-development-seedRémy Coutable2019-04-102-3/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It could happen that there's a cached (in Redis) ApplicationSetting record, and calling `Gitlab::CurrentSettings.current_application_settings` only returns it instead of creating a new DB record, which makes the `ApplicationSetting.current_without_cache.update!` call fail. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch ↵Filipa Lacerda2019-04-113-10/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '59928-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-stat_graph-scss' into 'master' Resolve "Fix the following style-lint errors and warnings for `app/assets/stylesheets/pages/stat_graph.scss`" Closes #59928 See merge request gitlab-org/gitlab-ce!27180
| * | | | | Create svg-w-100 utility class for svg containers59928-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-pages-stat_graph-scssJose Vargas2019-04-103-10/+8
| |/ / / / | | | | | | | | | | | | | | | The class makes a svg tag 100% width
* | | | | Merge branch 'limit-amount-of-created-pipelines' into 'master'Grzegorz Bizon2019-04-112-12/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Process at most 4 pipelines during push See merge request gitlab-org/gitlab-ce!27205
| * | | | | Process at most 4 pipelines during pushlimit-amount-of-created-pipelinesKamil Trzciński2019-04-102-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a limitation that we will try to create pipeline for at most 4 first changes (branches and tags). This does not affect processing of Pipelines for Merge Requests, as each updated MR will have associated pipeline created.
* | | | | | Merge branch 'gt-fix-styling-for-pages-import' into 'master'Phil Hughes2019-04-112-3/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix styling for `app/assets/stylesheets/pages/detail_page.scss` Closes #59909 See merge request gitlab-org/gitlab-ce!26873
| * | | | | | Replace properties with utility classGeorge Tsiolis2019-04-102-3/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch ↵Kushal Pandya2019-04-111-3/+16
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | '10017-move-ee-differences-for-app-assets-javascripts-boards-models-list-js' into 'master' Backport of Resolve "Move EE differences for `app/assets/javascripts/boards/models/list.js`" See merge request gitlab-org/gitlab-ce!27198
| * | | | | Backported changes from EE for board list model10017-move-ee-differences-for-app-assets-javascripts-boards-models-list-jsConstance Okoghenun2019-04-101-3/+16
| | | | | |
* | | | | | Merge branch ↵Kushal Pandya2019-04-111-1/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '10016-move-ee-differences-for-app-assets-javascripts-boards-models-issue-js' into 'master' Backport of "Move EE differences for `app/assets/javascripts/boards/models/issue.js`" See merge request gitlab-org/gitlab-ce!27197
| * | | | | | Backported changes from EE for board issue model10016-move-ee-differences-for-app-assets-javascripts-boards-models-issue-jsConstance Okoghenun2019-04-101-1/+15
| |/ / / / /
* | | | | | Align UrlValidator to validate_url gem implementation.Thong Kuah2019-04-1112-124/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed UrlValidator to AddressableUrlValidator to avoid 'url:' naming collision with ActiveModel::Validations::UrlValidator in 'validates' statement. Make use of the options attribute of the parent class ActiveModel::EachValidator. Add more options: allow_nil, allow_blank, message. Renamed 'protocols' option to 'schemes' to match the option naming from UrlValidator.
* | | | | | Revert "Merge branch 'tz-reorganise-digests-json' into 'master'"tz-revert-new-emojis-loadingTim Zallmann2019-04-101802-205/+99
| |/ / / / |/| | | | | | | | | | | | | | Reverts the loading of emojis and its images to move forward with RC
* | | | | Externalize strings in app/workersMartin Wortschack2019-04-103-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - email_receiver_worker - object_storage/migrate_uploads_worker - Update PO file
* | | | | Merge branch 'winh-jest-valid-describe' into 'master'Kushal Pandya2019-04-101-6/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable ESLint rule jest/valid-describe See merge request gitlab-org/gitlab-ce!27140
| * | | | | Hard code test name in timeline_entry_item_spec.jsWinnie Hellmann2019-04-101-6/+0
| | |/ / / | |/| | |
* | | | | Correct path to cluster health partialReuben Pereira2019-04-102-1/+6
| |_|/ / |/| | |
* | | | Add time tracking to issue board entitiespataar2019-04-101-0/+1
|/ / /
* | | Merge branch 'revert-2cc01f12' into 'master'Rémy Coutable2019-04-102-36/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'sh-optimize-projects-api' into 'master'" Closes #60315 See merge request gitlab-org/gitlab-ce!27195
| * | | Revert "Merge branch 'sh-optimize-projects-api' into 'master'"revert-2cc01f12Stan Hu2019-04-102-36/+9
| |/ / | | | | | | This reverts merge request !26481
* | | Add more info logging to cluster appsDylan Griffith2019-04-104-0/+20
|/ / | | | | | | | | Log events so that it's easy to see when different requests are starting.
* | Fix MR assignees for push optionsNick Thomas2019-04-091-2/+2
| | | | | | | | | | | | | | | | | | With multiple MR assignees, `merge_request.assignee_id` is always nil, and `merge_request.assignee_ids` isn't in `merge_request.attributes`. So the existing code doesn't set assignees in the created MR. This fix gets all the tests passing, but we should also check that no other associations in the MergeRequest need similar fixups.
* | Merge branch ↵Robert Speicher2019-04-091-17/+23
|\ \ | | | | | | | | | | | | | | | | | | '6649-extract-ee-specific-files-lines-for-ci-cd-app-serializers' into 'master' Extract preloaded_relations See merge request gitlab-org/gitlab-ce!27168
| * | Extract preloaded_relations into method6649-extract-ee-specific-files-lines-for-ci-cd-app-serializersMatija Čupić2019-04-091-17/+23
| | |
* | | Mark unverified pages domains for removalVladimir Shushlin2019-04-094-12/+20
| | | | | | | | | | | | | | | | | | | | | Set pages_domain.remove_at when disabling it Add specs for marking pages domain for removal Notify user that domain is being removed Add documentation
View Lorry Controller Status