summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | Update GitLab Runner Helm Chart to 0.2.0Tomasz Maczukin2019-02-221-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'design-management-vue-app-ce' into 'master'Filipa Lacerda2019-02-252-8/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port design-management-vue-app to CE See merge request gitlab-org/gitlab-ce!25494
| * | | | | | | | | | | | Port design-management-vue-app to CEPhil Hughes2019-02-222-8/+10
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'sh-fix-double-xhr-pipelines' into 'master'Filipa Lacerda2019-02-252-5/+18
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate XHR request when requesting new pipeline page Closes #58095 See merge request gitlab-org/gitlab-ce!25506
| * | | | | | | | | | | | Remove duplicate XHR request when requesting new pipeline pageStan Hu2019-02-232-5/+18
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a user clicked on another page in the pipeline page, the following would happen: 1. PipelinesService.getPipelines() would be called to fetch the new page 2. In the success handler, Poll.restart() would be called 3. This would invoke Poll.makeRequest(), which would fire off a new request. To fix this, we introduce a enable(), which will: 1. Update the request data accordingly 2. Clear the old timeout if necessary and start a new timer Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58095
* | | | | | | | | | | | Merge branch '57785-create-project-template-for-netlify' of ↵Jason Lenny2019-02-251-0/+20
| |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce into 57785-create-project-template-for-netlify
* | | | | | | | | | | Merge branch 'winh-remove-convertPermissionToBoolean' into 'master'Clement Ho2019-02-251-15/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove convertPermissionToBoolean() from common_utils.js See merge request gitlab-org/gitlab-ce!25454
| * | | | | | | | | | | Remove convertPermissionToBoolean() from common_utils.jsWinnie Hellmann2019-02-211-15/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '54924-refactor-notes-actions-params' into 'master'Lin Jen-Shin2019-02-232-34/+27
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor params for NotesActions Closes #54924 See merge request gitlab-org/gitlab-ce!25278
| * | | | | | | | | | | Refactor params for notes_actionsHeinrich Lee Yu2019-02-232-34/+27
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes unneeded params from permitted list This also fixes commenting on commits with a hash starting with a large number
* | | | | | | | | | | Merge branch '53325-admin-runners-page-fails-with-an-sql-statement-timeout' ↵Grzegorz Bizon2019-02-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "/admin/runners page fails with an SQL Statement Timeout" Closes #53325 See merge request gitlab-org/gitlab-ce!25220
| * | | | | | | | | | | Use limited counter for buildsMatija Čupić2019-02-131-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Only allow 30 RPCs per test case to GitalyZeger-Jan van de Weg2019-02-221-3/+6
| |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, 35 Gitaly RPCs were allowed. But recently there's been a renewed interest in performance. By lowering the number of calls new N + 1's will pop up. Later commits will add blocks to ignore the raised errors, followed by an issue for each to be fixed.
* | | | | | | | | | | Improve snippets empty stateGeorge Tsiolis2019-02-228-15/+59
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '55703-md-image-borders' into 'master'Kushal Pandya2019-02-222-8/+10
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only show borders around markdown images in notes Closes #55703 See merge request gitlab-org/gitlab-ce!25448
| * | | | | | | | | | Only show borders for images in notesSimon Knox2019-02-223-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compatible with https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5162
| * | | | | | | | | | Update template name for Operations nav linkSimon Knox2019-02-211-1/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '55057-system-message-to-core' into 'master'Sean McGivern2019-02-2212-3/+211
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port EE System Header And Footer feature to CE Closes #55057 See merge request gitlab-org/gitlab-ce!25241
| * | | | | | | | | | Port EE System Header And Footer feature to CEDouwe Maan2019-02-2112-3/+211
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove EE specific code remove EE licence checks move migration from EE to CE folder structure move specs from EE to CE folder structure remove EE specific flag specs
* | | | | | | | | | Remove auto-appended unitsAdriel Santiago2019-02-221-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicate units from metrics dashboard graphs
* | | | | | | | | | Merge branch '56873-only-load-syntax-highlighting-css-when-selected' into ↵Phil Hughes2019-02-2213-31/+34
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Only load syntax highlighting css when selected" Closes #57739 and #56873 See merge request gitlab-org/gitlab-ce!25232
| * | | | | | | | | | Move highlight themes to subfolderSimon Knox2019-02-228-9/+9
| | | | | | | | | | |
| * | | | | | | | | | Only load selected syntax highlight CSSSimon Knox2019-02-1511-28/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile highlight CSS separately Move highlight-specific mixins out of mixins.scss Rename solarized themes to match theme name as this was a smaller change than changing all instances to snake_case
* | | | | | | | | | | fix-52198-timer-is-vertically-misaligned-for-delayed-jobs-in-pipelactionsGokhan Apaydin2019-02-221-2/+2
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-broken-select2-import-project-app' into 'master'Phil Hughes2019-02-221-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix select2 import for project import app namespace select See merge request gitlab-org/gitlab-ce!25307
| * | | | | | | | | | | Fix select2 import for project import app namespace selectLuke Bennett2019-02-151-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '9841-geo-unable-to-compare-branches-on-secondary' into 'master'James Lopez2019-02-221-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to compare branches on a read-only instance See merge request gitlab-org/gitlab-ce!25414
| * | | | | | | | | | | | Allow users to compare branches on a read-only instanceDouglas Barbosa Alexandre2019-02-201-2/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'ps-remove-mr-widget-section-padding' into 'master'Annabel Dunstone Gray2019-02-212-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove padding for mr-widget-section See merge request gitlab-org/gitlab-ce!25475
| * | | | | | | | | | | | | Remove padding for mr-widget-sectionPaul Slaughter2019-02-212-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class is used in: - `group_test_reports_app.vue` where the padding is overruled by `.mr-report` - `mr_widget_options.vue` where the padding is overruled by `p-0` - `ee/mr_widget_options.vue` where there is a bug because the padding is not overruled.
* | | | | | | | | | | | | | Merge branch 'dz-sort-labels-alphabetically' into 'master'Douglas Barbosa Alexandre2019-02-213-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort labels alphabetically on issues and merge requests list Closes #57003 See merge request gitlab-org/gitlab-ce!25470
| * | | | | | | | | | | | | Sort labels alphabeticallyDmitriy Zaporozhets2019-02-213-2/+6
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sorts labels alphabetically on issues (and merge requests) list. Before it was order id desc. Now it will be consistent with sidebar and labels page. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | Merge branch ↵Robert Speicher2019-02-219-3/+79
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '56492-implement-new-arguments-state-closed_before-and-closed_after-for-issuesresolver-in-graphql' into 'master' Implement new arguments `state`, `closed_before` and `closed_after` for `IssuesResolver` in GraphQL Closes #56492 See merge request gitlab-org/gitlab-ce!24910
| * | | | | | | | | | | | | Add GraphQL filters for issuables (state, labels, time fields)Rémy Coutable2019-02-216-3/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | Allow IssuableFinder to filter by closed_atRémy Coutable2019-02-213-0/+23
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | Merge branch '57930-create-smoke-test-for-autodevops' into 'master'Dan Davison2019-02-212-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Create smoke test for AutoDevOps" Closes #57930 See merge request gitlab-org/gitlab-ce!25442
| * | | | | | | | | | | | Add smoke test for autodevopsddavison2019-02-212-2/+2
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tag validation on pipeline page
* | | | | | | | | | | | Add `.text-underline` Utility ClassAndrew Fontaine2019-02-213-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Style status box links using bootstrap and other utility classes instead of styling all `a` tags in the status-box.
* | | | | | | | | | | | Make "moved" Link to Moved IssueAndrew Fontaine2019-02-212-2/+10
| |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The text "moved" now links to the issue the closed issue was moved to.
* | | | | | | | | | | Merge branch ↵James Lopez2019-02-211-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '57867-accessing-issue-1-of-gitlab-ce-via-the-api-results-in-500-internal-server-error' into 'master' Speed up find_by when used on finders Closes #57867 See merge request gitlab-org/gitlab-ce!25421
| * | | | | | | | | | | Ignore ordering when calling find_by on findersSean McGivern2019-02-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We shouldn't care about the ordering here; if we did, it would be more appropriate to use `take` or `first`. Having the ordering can result in the database picking a bad query plan, as it might think sorting the whole table first is the best option.
* | | | | | | | | | | | Merge branch 'mind-the-oxford-comma' into 'master'Kushal Pandya2019-02-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mind the oxford comma See merge request gitlab-org/gitlab-ce!25252
| * | | | | | | | | | | | Mind the oxford commaRobert Schilling2019-02-141-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Catch exception in calculate reactive cacheReuben Pereira2019-02-213-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return the exception as an error.
* | | | | | | | | | | | | Merge branch 'design-management-issue-tab-ce' into 'master'Filipa Lacerda2019-02-213-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport of design-management-issue-tab See merge request gitlab-org/gitlab-ce!25429
| * | | | | | | | | | | | CE backport of design-management-issue-tabPhil Hughes2019-02-203-3/+9
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backports template and Vue changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9632 to CE
* | | | | | | | | | | | Move language setting to preferencesFabian Schneider2019-02-205-5/+19
| | | | | | | | | | | |
* | | | | | | | | | | | Move ChatOps to CoreJames Fargher2019-02-208-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ChatOps used to be in the Ultimate tier.
* | | | | | | | | | | | fix #39010 - add left margin to 1st time contributor badgeGokhan Apaydin2019-02-201-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Docs: change badges.svg example to pipeline.svgAviad Levy2019-02-201-1/+1
| |_|_|_|_|_|/ / / / |/| | | | | | | | |