- 23 Nov, 2016 27 commits
-
-
-
Achilleas Pipinellis authored
Add support of Chrome/Chromium in requirements.md See merge request !7703
-
Achilleas Pipinellis authored
[ci skip]
-
Sean McGivern authored
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24863 See merge request !7698
-
Sean McGivern authored
Add a starting date to milestones Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23704 See merge request !7484
-
Sean McGivern authored
post_receive: accept any user email from last commit See merge request !7225
-
Sean McGivern authored
Use authorized projects in ProjectTeam Closes #23938 and #23636 See merge request !7586
-
Douwe Maan authored
-
Rémy Coutable authored
Ensure we sanitize branch names with path-unfriendly characters See merge request !7696
-
Valery Sizov authored
-
Ahmad Sherif authored
-
Ahmad Sherif authored
-
Ahmad Sherif authored
-
Ahmad Sherif authored
Closes #23938
-
Ahmad Sherif authored
-
Ahmad Sherif authored
So that it matches the same access given in Projects::CreateService#after_create_actions
-
Ahmad Sherif authored
Use the minimum access level of group link and group member when inserting authorized project records
-
Rémy Coutable authored
Remove empty describe block in service spec See merge request !7669
-
Sean McGivern authored
Notify broken master on #development See merge request !7593
-
Sean McGivern authored
Edit help text to clarify that tags are annotated. Closes #24554 See merge request !7553
-
Douwe Maan authored
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
-
Rémy Coutable authored
Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Fatih Acet authored
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
-
James Lopez authored
-
Robert Speicher authored
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
-
Robert Speicher authored
Fix Sidekiq stats in admin area Closes #23825, #24675 See merge request !7654
-
Alfredo Sumaran authored
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
-
- 22 Nov, 2016 13 commits
-
-
Fatih Acet authored
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
-
Fatih Acet authored
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
-
Fatih Acet authored
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
-
Annabel Dunstone Gray authored
-
Achilleas Pipinellis authored
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
-
Achilleas Pipinellis authored
Add some clarification for some files under config/* Add some clarification for some files under config/* I didn't add a lot of them because I am not very familiar about how they work and I am not sure if we really need to explain files like config/database.yml because if you know Rails you must know how that works. At any rate, I think this is a beginning and we could keep documenting more files in the future. Closes #18373 See merge request !4851
-
blackst0ne authored
Added tests Added changelog entry Resolved all issues in code
-
Fatih Acet authored
Fix deselecting calendar days on contribution graph ## What does this MR do? Fix deselecting calendar days on contribution graph ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? In `master`, you can currently deselect a calendar day after selecting but you cannot reselect that day. ## Screenshots (if relevant) Before: ![2016-10-25_10.42.20](/uploads/7d442c09cd15082cf69f673a544b56f9/2016-10-25_10.42.20.gif) After: ![2016-10-25_10.40.35](/uploads/6123365f0ec63ee84658ee6057e7715c/2016-10-25_10.40.35.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - 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 you do - 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 #22381 See merge request !6453
-
Fatih Acet authored
Merge branch '24161-non-intuitive-buttons-for-import-sources-in-administrator-settings-enable-disable' into 'master' Import sources buttons to checkboxes ## What does this MR do? Swaps the `/application_settings` `Import Sources` buttons to checkboxes. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![2016-11-19_14.42.39](/uploads/5bf53ecb54765bd80ab275714208ee9a/2016-11-19_14.42.39.gif) ## 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 - [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 #24161 See merge request !7598
-
Mike Greiling authored
-
Mike Greiling authored
-
Achilleas Pipinellis authored
Update github.md Hi, I ran into a few pitfalls while I enabled OmniAuth to be able to migrate repos from github to my omnibus-gitlab instance today, so here are my findings: These docs state thate the default authorization callback URL is `'${YOUR_DOMAIN}/import/github/callback'`, but the screenshot only shows `'${YOUR_DOMAIN}'`, which works, so I removed the ambiguity. When editing `gitlab_rails['omniauth_providers']` for github.com, you have to omit the `"url" => "https://github.com/",` part, otherwise it won't work (OmniAuth will stay deactivated). This is backed by the configuration details of the "from-source-installation" which also omits the url in the `yml` file. After changing the `gitlab.rb` file, `sudo gitlab-ctl reconfigure` needs to be run, which is missing in the docs. Following the updated version of this documentation I was able to enable OmniAuth. If anything I edited is wrong, please correct me, as I don't know how the "from-source-installations" would react to my changes. Best regards, Florian See merge request !4072
-
Achilleas Pipinellis authored
Reduce size of images in docs from 25MB to 13MB using pngquant - Previous MR that used zopflipng https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4325 - Similar MR to another repo https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/3232 See merge request !7679
-