summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Removed data-user-is view codeevents-cache-invalidationYorick Peterse2016-11-256-33/+25
| | | | With events no longer being cached this is no longer needed.
* Remove event caching codeYorick Peterse2016-11-2315-99/+13
| | | | | | | | | | | | | | | | | | | Flushing the events cache worked by updating a recent number of rows in the "events" table. This has the result that on PostgreSQL a lot of dead tuples are produced on a regular basis. This in turn means that PostgreSQL will spend considerable amounts of time vacuuming this table. This in turn can lead to an increase of database load. For GitLab.com we measured the impact of not using events caching and found no measurable increase in response timings. Meanwhile not flushing the events cache lead to the "events" table having no more dead tuples as now rows are only inserted into this table. As a result of this we are hereby removing events caching as it does not appear to help and only increases database load. For more information see the following comment: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6578#note_18864037
* 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
| * | | | | | | | | | | | Add omnibus rake task. Fix source envmrchrisw/mysql-installChris Wilson2016-08-191-1/+8
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'doc-for-config' into 'master' Achilleas Pipinellis2016-11-221-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | Update wordings by feedback from:doc-for-configLin Jen-Shin2016-06-231-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4851
| * | | | | | | | | | | | | Add some clarification for some files under config/*Lin Jen-Shin2016-06-221-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | Merge branch 'disable-calendar-deselection' into 'master' Fatih Acet2016-11-223-0/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | Fix deselecting calendar days on contribution graphClement Ho2016-11-043-0/+46
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch ↵Fatih Acet2016-11-223-8/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | | | | | | | | | | | | Swapped buttons for checkboxes24161-non-intuitive-buttons-for-import-sources-in-administrator-settings-enable-disableLuke "Jared" Bennett2016-11-213-8/+10
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-11-221-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'patch-1' of https://gitlab.com/ffittschen/gitlab-ce into patch-1Florian Fittschen2016-10-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # doc/integration/github.md
| | * | | | | | | | | | | | | | | | Update github.mdFlorian2016-05-061-3/+4
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Update github.mdFlorian2016-10-211-1/+16
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'docs/optimize-images' into 'master' Achilleas Pipinellis2016-11-22384-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | Reduce size of images from 25MB to 13MB using pngquantAchilleas Pipinellis2016-11-22384-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Took it from https://gitlab.com/gitlab-com/www-gitlab-com/merge_requests/3232 [ci skip]
* | | | | | | | | | | | | | | | | | | Merge branch '24754-fix-npm-warnings-for-eslint-plugin-import' into 'master' Fatih Acet2016-11-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | roll back eslint-plugin-import node module to the version required by ↵24754-fix-npm-warnings-for-eslint-plugin-importMike Greiling2016-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eslint-config-airbnb
* | | | | | | | | | | | | | | | | | | Merge branch 'emoji-btn-disabled' into 'master' Fatih Acet2016-11-223-42/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | | Disabled award emoji button when user is not logged inemoji-btn-disabledPhil Hughes2016-11-223-42/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #24680