summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Adds polyfill for CustomEventcustom-event-polyfillFilipa Lacerda2016-11-231-0/+12
|
* Merge branch 'docs/chrome-support-requirements' into 'master' Achilleas Pipinellis2016-11-231-1/+1
|\ | | | | | | | | Add support of Chrome/Chromium in requirements.md See merge request !7703
| * Add support of Chrome/Chromium in requirements.mdAchilleas Pipinellis2016-11-231-1/+1
| | | | | | | | [ci skip]
* | Merge branch '24863-mrs-without-discussions-are-mergeable' into 'master' Sean McGivern2016-11-233-1/+63
|\ \ | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24863 See merge request !7698
| * | Correctly determine mergeability of MR with no discussions24863-mrs-without-discussions-are-mergeableDouwe Maan2016-11-233-1/+63
| | |
* | | Merge branch 'milestone_start_date' into 'master' Sean McGivern2016-11-2327-101/+205
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add a starting date to milestones Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23704 See merge request !7484
| * | | Add a starting date to milestonesmilestone_start_dateValery Sizov2016-11-2327-101/+205
| | | |
* | | | Merge branch 'post_receive-any-email' into 'master' Sean McGivern2016-11-233-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | post_receive: accept any user email from last commit See merge request !7225
| * | | | update existing testElan Ruusamäe2016-11-061-1/+1
| | | | |
| * | | | post_receive: accept any user email from last commitElan Ruusamäe2016-11-042-1/+5
| | | | |
* | | | | Merge branch 'fix/drop-project-authorized-for-user' into 'master' Sean McGivern2016-11-2314-185/+121
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use authorized projects in ProjectTeam Closes #23938 and #23636 See merge request !7586
| * | | | | Update ProjectTeam#fetch_members to use project authorizationsfix/drop-project-authorized-for-userAhmad Sherif2016-11-235-68/+32
| | | | | |
| * | | | | Update ProjectTeam#max_member_access_for_user_ids to use project authorizationsAhmad Sherif2016-11-234-49/+15
| | | | | |
| * | | | | Update user's authorized projects if project is allowed to share with groupAhmad Sherif2016-11-232-1/+11
| | | | | |
| * | | | | Drop Project#authorized_for_user? in favor of ProjectTeam#member?Ahmad Sherif2016-11-237-65/+61
| | | | | | | | | | | | | | | | | | | | | | | | Closes #23938
| * | | | | Refresh user's authorized projects when one of his memberships are updatedAhmad Sherif2016-11-231-1/+1
| | | | | |
| * | | | | Change personal projects access level to master in ↵Ahmad Sherif2016-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User#project_authorizations_union So that it matches the same access given in Projects::CreateService#after_create_actions
| * | | | | Use the minimum access level of group link and group member when inserting ↵Ahmad Sherif2016-11-231-1/+1
| | |/ / / | |/| | | | | | | | | | | | | authorized project records
* | | | | Merge branch 'fix-ee_compat_check-when-branch-contains-a-slash' into 'master' Rémy Coutable2016-11-231-2/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Ensure we sanitize branch names with path-unfriendly characters See merge request !7696
| * | | | Ensure we sanitize branch names with path-unfriendly charactersRémy Coutable2016-11-231-2/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'remove-empty-describe-block' into 'master' Rémy Coutable2016-11-231-3/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove empty describe block in service spec See merge request !7669
| * | | | | Remove empty describe block in service specSemyon Pupkov2016-11-221-3/+0
| | | | | |
* | | | | | Merge branch 'zj-notify-development' into 'master' Sean McGivern2016-11-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notify broken master on #development See merge request !7593
| * | | | | | Notify broken master on #development zj-notify-developmentZeger-Jan van de Weg2016-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AKA: - move all conversations to #core - beating will continue until morale improves - Learn by pain - Pain driven development
* | | | | | | Merge branch 'dev-issue-24554' into 'master' Sean McGivern2016-11-232-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edit help text to clarify that tags are annotated. Closes #24554 See merge request !7553
| * | | | | | | Edit help text to clarify that tags are annotated.Liz Lam2016-11-212-1/+5
| | | | | | | |
* | | | | | | | Merge branch 'fix/cycle-analytics-plan-issue' into 'master' Douwe Maan2016-11-234-1/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cycle analytics plan stage when commits are missing Takes into account when commits are `nil` so the app doesn't throw an exception and also removes them. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24836 - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !7694
| * | | | | | | | Fix and relevant spec for plan stage breaking with nil commitsfix/cycle-analytics-plan-issueJames Lopez2016-11-234-1/+15
| | | | | | | | |
* | | | | | | | | Merge branch 'status-badge-spacing' into 'master' Fatih Acet2016-11-233-18/+10
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix spacing between icon and word in status badge Before: ![Screen_Shot_2016-11-22_at_11.44.16_AM](/uploads/65c5abc6dc08985cb3079b7c2af03715/Screen_Shot_2016-11-22_at_11.44.16_AM.png) After: ![Screen_Shot_2016-11-22_at_11.44.01_AM](/uploads/1b6261b64c65de5a718b68873e069ac9/Screen_Shot_2016-11-22_at_11.44.01_AM.png) cc @dimitrieh See merge request !7678
| * | | | | | | | | Fix spacing between icon and word in status badgestatus-badge-spacingAnnabel Dunstone Gray2016-11-223-18/+10
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'eslint-html-report' into 'master' Robert Speicher2016-11-233-3/+24
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate ESLint HTML report ## What does this MR do? Generate a HTML report for the linting errors that ESLint discovered (including files that contain `/* eslint-disable */`). See merge request !7374
| * | | | | | | | Generate ESLint HTML report (!7374)winniehell2016-11-223-3/+24
| | | | | | | | |
* | | | | | | | | Merge branch 'fix_sidekiq_stats_in_admin_area' into 'master' Robert Speicher2016-11-233-7/+30
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Sidekiq stats in admin area Closes #23825, #24675 See merge request !7654
| * | | | | | | | | Fix sidekiq stats in admin areablackst0ne2016-11-233-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added tests Added changelog entry Resolved all issues in code
* | | | | | | | | | Merge branch '24756-clean-up-eslintrc-globals' into 'master' Alfredo Sumaran2016-11-2318-30/+53
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up globals exemptions within .eslintrc ## What does this MR do? Removes unnecessarily-exempted globals from `.eslintrc` where possible. ## Are there points in the code the reviewer needs to double check? `npm run eslint` should return 0 errors. ## Why was this MR needed? see Issue #24756 ## Does this MR meet the acceptance criteria? - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24756 See merge request !7642
| * | | | | | | | | | keep json alphabetized24756-clean-up-eslintrc-globalsMike Greiling2016-11-221-6/+6
| | | | | | | | | | |
| * | | | | | | | | | add "gon" to list of expected globalsMike Greiling2016-11-221-0/+1
| | | | | | | | | | |
| * | | | | | | | | | clean up globals exemptions within .eslintrcMike Greiling2016-11-2218-25/+47
| | | | | | | | | | |
* | | | | | | | | | | Merge branch ↵Fatih Acet2016-11-224-5/+9
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24266-afraid-to-press-the-orange-button-on-merge-request-screen' into 'master' If Build running change accept merge request when build succeeds button from orange to blue ## What does this MR do? If Build running change accept merge request when build succeeds button from orange to blue ## Are there points in the code the reviewer needs to double check? I didn't really check, but to my knowledge these changes should fix it. Would love to know how to set up working pipelines in my local build. ## Why was this MR needed? orange was to big a warning color for this button ## Screenshots (if relevant) ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c9100be272c5567ee4dfa281cffaeb7a/_24266_merge-request-01.png) ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/bb84ea5b519fc67babf8383f3b396fb7/_24266_merge-request-02.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24266 See merge request !7577
| * | | | | | | | | | Use btn-primary for running builds btnAnnabel Dunstone Gray2016-11-221-3/+3
| | | | | | | | | | |
| * | | | | | | | | | deleted old changelog entry24266-afraid-to-press-the-orange-button-on-merge-request-screenDimitrie Hoekstra2016-11-221-4/+0
| | | | | | | | | | |
| * | | | | | | | | | added proper changelog entryDimitrie Hoekstra2016-11-221-0/+4
| | | | | | | | | | |
| * | | | | | | | | | If Build running change accept merge request when build succeeds button from ↵Dimitrie Hoekstra2016-11-183-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | orange to blue
* | | | | | | | | | | Merge branch '24739-collapsed-build-list-sorting' into 'master' Fatih Acet2016-11-222-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort pipeline graph builds and build groups by name ## What does this MR do? Sorts builds and build groups by name within pipeline graphs ## Are there points in the code the reviewer needs to double check? Shouldn't be. This was a one-line change. ## Why was this MR needed? It can be difficult to find the build you are looking for within a group of similarly-named builds when they are in a seemingly random order. ## Screenshots (if relevant) ### Before: ![Screen_Shot_2016-11-22_at_2.48.11_PM](/uploads/27f3f9a2e29e7f0e5857bfd425b74306/Screen_Shot_2016-11-22_at_2.48.11_PM.png) ### After: ![Screen_Shot_2016-11-22_at_2.47.46_PM](/uploads/2c6ef1446a1de0012d091d6deef0992b/Screen_Shot_2016-11-22_at_2.47.46_PM.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24739 See merge request !7681
| * | | | | | | | | | | add CHANGELOG entry for !7681Mike Greiling2016-11-221-0/+4
| | | | | | | | | | | |
| * | | | | | | | | | | sort pipeline graph builds and build groups by nameMike Greiling2016-11-221-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch '24639-mr-widget-updates' into 'master' Fatih Acet2016-11-222-39/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify all MR widget text colors and background colors * Removes darker background color for `skipped` status * Makes all MR widget text gray Before: ![Screen_Shot_2016-11-18_at_7.52.16_AM](/uploads/4ee715aec9c453c5cfe1f259049adbde/Screen_Shot_2016-11-18_at_7.52.16_AM.png) After: ![Screen_Shot_2016-11-18_at_7.52.05_AM](/uploads/ea14d713a4e7d837bac4576815451dce/Screen_Shot_2016-11-18_at_7.52.05_AM.png) Closes #24639 See merge request !7571
| * | | | | | | | | | | | Remove view details link from MR widget24639-mr-widget-updatesAnnabel Dunstone Gray2016-11-181-3/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Unify all MR widget text colors and background colorsAnnabel Dunstone Gray2016-11-181-36/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'mrchrisw/mysql-install' into 'master' Achilleas Pipinellis2016-11-221-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add omnibus rake task ## Why was this MR needed? There was no omnibus example ## Does this MR meet the acceptance criteria? - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) See merge request !5416