- 23 Nov, 2016 1 commit
-
-
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 39 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
-
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
-
Fatih Acet authored
Fix NPM install warnings due to incompatible dependency version ## What does this MR do? Rolls back `eslint-plugin-import` to semver `^1.16.0` for compatibility with `eslint-config-airbnb`. ## Are there points in the code the reviewer needs to double check? Shouldn't be. ## Why was this MR needed? A warning message was being generated every time we run `npm install`, and there are possibly other side effects due to module incompatibility. ## Does this MR meet the acceptance criteria? - [x] All builds are passing - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) ## What are the relevant issue numbers? Closes #24754 See merge request !7641
-
Fatih Acet authored
Disabled award emoji button when user is not logged in ## What does this MR do? The award emoji buttons are now disabled when the user is not signed in, stopping them from clicking it & then getting an error. ## Screenshots (if relevant) ![Screen_Shot_2016-11-22_at_10.25.20](/uploads/210378bde90e689fbc12940ce271c05e/Screen_Shot_2016-11-22_at_10.25.20.png) ## What are the relevant issue numbers? Closes #24680 See merge request !7651
-
Kamil Trzciński authored
Fix exceptions when loading build trace ## What does this MR do? This MR fixes exceptions when loading build trace. - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] Tests added for this feature/bug ## What are the relevant issue numbers? Closes #24638 See merge request !7658
-
Fatih Acet authored
Resolve "Labeling system notes downcase labels" ## What does this MR do? This MR fixes issues of label gets lowercase in system note as describe in #24737 ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? This MR fixes the regression of becoming labels and its description and title lowercase in system note ## Screenshots (if relevant) **Before:** ![before](/uploads/ac99fd5d1219ee3b4b7c699319267087/before.png) **After:** ![after](/uploads/d1b6413c857d18f122252f421ac498b0/after.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 - [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 #24737 Closes #24751 See merge request !7636
-
Mike Greiling authored
-
Achilleas Pipinellis authored
Took it from https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/3232 [ci skip]
-
Achilleas Pipinellis authored
Add changes to JIRA api docs See merge request !7675
-
Mike Greiling authored
-
Mike Greiling authored
-
Fatih Acet authored
shows unconfirmed email status in profile ## What does this MR do? This MR closes #24413 ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? When modifying an account email address in profile settings a new confirmation email is sent, and shows the information that s/he got an email to confirm. ## Screenshots (if relevant) **Before** ![2016-11-22_19.54.51](/uploads/361fd605a3c1e997a58defe45a63081a/2016-11-22_19.54.51.gif) **After** ![2016-11-22_20.01.21](/uploads/6b07663f71d6684d2138798920cf07af/2016-11-22_20.01.21.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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24413 See merge request !7611
-
Annabel Dunstone Gray authored
Last minute CI Style tweaks for 8.14 ## What does this MR do? - Skipped builds now have use a lighter gray. - Converted all status icons to be managed by scss colors only - Consolidated all status icon styles into icons.scss - Deleted any classes or styles within the svg's - Gave status badges a hover style, but only if clickable - Fixed alignment issue mini-pipeline graph ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? As per the discussion in the slack chat https://gitlab.slack.com/archives/ci/p1479743986004879 ## Screenshots (if relevant) - skipped builds: ![image](/uploads/f59c615045472b9b13940463a64c8038/image.png) ![image](/uploads/26503d1da9c93b3c22c5c0c1369feceb/image.png) - hover style status badges: ![2016-11-22_00.21.27](/uploads/36afa7aa64d60e1755bf39d97f90c59f/2016-11-22_00.21.27.gif)![2016-11-22_00.58.38](/uploads/1d95fa5db124412d3f83b3e79b9b71ec/2016-11-22_00.58.38.gif) - mini pipeline graph: before: ![image](/uploads/38e5e57ada3907b17c6e24e1446b4514/image.png) after: ![image](/uploads/de4476693a1397eebfc680661159daf7/image.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? See merge request !7643
-
Alejandro Rodríguez authored
-
Alejandro Rodríguez authored
[ci skip]
-
Rémy Coutable authored
See merge request !7676
-
Alejandro Rodríguez authored
-
Achilleas Pipinellis authored
[ci skip]
-
James Lopez authored
fixed bug to do with calculating durations Fixes a couple of small bugs while calculating durations in cycle analytics - probably due to some bad refactoring - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug - [ ] 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) ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24796 See merge request !7663
-
Achilleas Pipinellis authored
[ci skip]
-
Kamil Trzciński authored
Merge branch '24804-wrong-render-index-should-be-render-show-in-projects-pipelinessettingscontroller-update' into 'master' Resolve "Wrong `render 'index'`, should be `render 'show'` in `Projects::PipelinesSettingsController#update`" Closes #24804 See merge request !7665
-
Rémy Coutable authored
See merge request !7672
-
Alejandro Rodríguez authored
-
Kamil Trzciński authored
Issue creation now accepts trailing whitespace See merge request !7633
-
Sean McGivern authored
Add shortcuts for adding users to a project team with a specific role Closes #20944 See merge request !7565
-
Rémy Coutable authored
Do not use MergeRequest#commits in define_pipelines_vars ## What does this MR do? `MergeRequest#commits` requires merge_request_diff to be present. This is not the case when creating a new merge request. ## What are the relevant issue numbers? Fix up for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7568 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24798 See merge request !7664
-
Sean McGivern authored
Allow admins to stop impersonating users without e-mail addresses Closes #24576 See merge request !7550
-
Rémy Coutable authored
Fix IID filter for merge requests and milestones I updated the example in the docs and added a test. The milestones API was also broken for the same reason. Related to !7358 and !7373 See merge request !7648
-
Rémy Coutable authored
Handle orphans when removing soft deleted groups This fixes the migration from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7528 so it handles orphans as mentioned in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7528/diffs#note_18800962. This needs to go in 8.14.0 as otherwise customers may run into the same problem. See merge request !7657
-