- 12 Dec, 2016 20 commits
-
-
Alfredo Sumaran authored
Resolve "Fix awkward wording in "cherry-pick" and "revert" errors." ## What does this MR do? Fixes a poorly worded error message as well as some other minor bugs I encountered while investigating #21812. ## Are there points in the code the reviewer needs to double check? Should be pretty straight forward. ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] ~~[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 - [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? Originally a part of #21812 Closes #25429 See merge request !7981
-
Rémy Coutable authored
Update Sidekiq from 4.2.1 to 4.2.7. Includes various bug fixes, mostly for Rails 5. Changelog: https://github.com/mperham/sidekiq/blob/fc168fe393bee3ad1fcbb52cff2d84af86c38cc4/Changes.md See merge request !8032
-
Fatih Acet authored
Fix TypeError: Cannot read property 'initTabs' ## What does this MR do? Adds a default value to the `options` argument in order to prevent errors when `Pipelines` is initialised without arguments. Adds tests to guarantee this does not happen again. Adds back removed pipeline class to make the pipeline graph visible, `js-pipeline-graph` ## Why was this MR needed? In the places where `Pipelines` is initialised without arguments it throws an error: `TypeError: Cannot read property 'initTabs'` ## 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 - [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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25483 Closes #25493 See merge request !8009
-
Gabriel Mazetto authored
Avoid escaping relative links in Markdown twice ## What does this MR do? Avoid escaping relative links in Markdown twice. ## Why was this MR needed? Relative links with special characters (e.g. spaces) were escaped twice. ## What are the relevant issue numbers? closes #25191, #25318 See merge request !7940
-
Fatih Acet authored
Stop DDOSing ourselves ## What does this MR do? Adds `hiddenInterval` to `SmartInterval` settings. This will be the interval used whilst the tab is inactive. If this setting is not set it will `cancel` as it would have done before. Adds `immediateExecution` to `SmartInterval` settings. This boolean will dictate whether to execute the callback once before the first interval or not. Uses `SmartInterval` with the new `hiddenInterval` settings to slow the polling for the MR widget on inactive tabs. Fixes issue where `SmartInterval`s `visibilitychange` listeners are not getting called because jQuery doesn't support them. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? We're ddosing ourselves on the MR page. ## Screenshots (if relevant) ![Screen_Shot_2016-11-25_at_18.36.25](/uploads/c4457c55872f592e921a50cf5462022e/Screen_Shot_2016-11-25_at_18.36.25.png) ~30 seconds difference between the first 2 requests _(a couple requests had fired already so it's backed off already)_. _-changed to different tab-_ ~2 minutes difference between the middle 2 requests. _-changed tab back to MR-_ ~10 seconds difference between the last 2 requests. ## 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 - [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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24807 See merge request !7762
-
Rémy Coutable authored
API: Add the project filter to the groups endpoint. Related to #22928. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25420 See merge request !8034
-
winniehell authored
-
Sean McGivern authored
Allow branch names with dots on API endpoint closes #25030 See merge request !7963
-
Luke "Jared" Bennett authored
Added hiddenInterval and immediateExecution settings, fixed visibilitychange listening, implemented with mr widget Updated tests Added tests Review changes
-
Robert Schilling authored
-
Filipa Lacerda authored
Fix broken tests
-
Filipa Lacerda authored
-
Filipa Lacerda authored
Fix undefined variable in es5
-
Filipa Lacerda authored
-
Sean McGivern authored
fix: 25294 - remove signed_out notification Closes #25294 See merge request !7958
-
Fatih Acet authored
Fix alignment for notification settings ajax response ## What does this MR do? Fixes a issue where an AJAX call to change your global notification settings will return an html partial which has the incorrect dropdown alignment class, in some cases causing the dropdown menu to become obscured on the left side of the screen. ## Are there points in the code the reviewer needs to double check? ## Screenshots (if relevant) See issue #25510 for a screenshot of the problem and steps to reproduce. ## Does this MR meet the acceptance criteria? - [ ] [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 - [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 #25510 See merge request !8024
-
jnoortheen authored
test: replaced signed_out message check with check for sign_in button fixes #25294
-
Sean McGivern authored
Adding support for personal snippet endpoint on the API Closes #22042 See merge request !6373
-
Sean McGivern authored
Fix typo See merge request !8029
-
Connor Shea authored
Includes various bug fixes, mostly for Rails 5. Changelog: https://github.com/mperham/sidekiq/blob/fc168fe393bee3ad1fcbb52cff2d84af86c38cc4/Changes.md
-
- 11 Dec, 2016 5 commits
-
-
Robert Schilling authored
Fix typo in curl example request See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html ## What does this MR do? Fix a typo in a curl example Closes #23834 ## Moving docs to a new location? See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location - [ x] Make sure the old link is not removed and has its contents replaced with a link to the new location. - [ x] Make sure internal links pointing to the document in question are not broken. - [ x] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory. - [ x] If working on CE, submit an MR to EE with the changes as well. See merge request !8030
-
Georg Hartmann authored
-
Ismail S authored
-
Achilleas Pipinellis authored
Change docs title to represent the edition See merge request !8026
-
Achilleas Pipinellis authored
-
- 10 Dec, 2016 6 commits
-
-
Mike Greiling authored
-
Mike Greiling authored
-
Mike Greiling authored
-
Mike Greiling authored
-
Mike Greiling authored
-
Mike Greiling authored
-
- 09 Dec, 2016 9 commits
-
-
Alfredo Sumaran authored
Use default btn styling for Housekeeping button on projects settings page Changes the Housekeeping button styling on the project settings page from ```btn-save``` to ```btn-default``` **BEFORE:** ![Screen_Shot_2016-12-06_at_12_51_42_PM](/uploads/1b1c8a26eead025062e2c98d9d0f4286/Screen_Shot_2016-12-06_at_12_51_42_PM.png) **AFTER:** ![Screen_Shot_2016-12-06_at_12_51_57_PM](/uploads/9e7937af4a058fa1aa8b45653dbad3ee/Screen_Shot_2016-12-06_at_12_51_57_PM.png) Closes #25324 cc: @awhildy See merge request !7959
-
Alfredo Sumaran authored
fix display hook error message ## What does this MR do? Fix hook error message display. ## Are there points in the code the reviewer needs to double check? Probably Hook will return the plain multi line text. It is better `pre` tag than `h4`. I thought of another good looking display, but I did not come up with it.
😓 ## Why was this MR needed? When the hook returns an STDERR, "Merge in progress" button spinning forever. Due to javascript's error. ## Screenshots (if relevant) When update hook returns an error like ``` XXXXXXXX YYYYYYYY ZZZZZZZZ ``` ![screen_shot](/uploads/8dac77972a309dfcb72c741dffbd7270/screen_shot.png) ## What are the relevant issue numbers? Closes #24020 See merge request !7775 -
Sean McGivern authored
Stop replacing `$your_email` with the user's email in the `/help` pages See merge request !8014
-
Jacob Schatz authored
Remove 'Leave Project' and 'Leave Group' from settings dropdowns ## What does this MR do? Removes `Leave Project` and `Leave Group` from the settings dropdown. Adds it to the `views/shared/members/access_request_buttons.html.haml`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-11-19_at_15.34.26](/uploads/5c66a025513b4780a9e881f0036381e4/Screen_Shot_2016-11-19_at_15.34.26.png) ![Screen_Shot_2016-11-19_at_15.35.29](/uploads/ed74a5dfe982cf65bb49c0c4fb307061/Screen_Shot_2016-11-19_at_15.35.29.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 #23305 See merge request !7600
-
Rémy Coutable authored
Use gitlab-workhose 1.1.1 Change CI API rate limiting behavior. Will make a separate MR for 8-14-stable because that version lacks the workhorse install rake task. See merge request !7990
-
Fatih Acet authored
Updates the font weight of button styles because of the change to system fonts ## What does this MR do? Updates the font weight of button styles because of the change to system fonts ## Are there points in the code the reviewer needs to double check? - ## Why was this MR needed? Because of the change to system fonts the font weight for buttons needed to be toned down a bit. Seems only buttons styles were affected. ## Screenshots (if relevant) left = result ![image](/uploads/c75868dca76561cafd559fb721be0601/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? cc: @cperessini See merge request !8012
-
Fatih Acet authored
Updated members dropdowns ## What does this MR do? EE has different dropdowns to allow for group LDAP members to be overridden, this ports the dropdown changes over to reduce conflicts. ## Screenshots (if relevant) ![Screen_Shot_2016-12-07_at_15.28.20](/uploads/6cb6def34015b024dc878aa3b99be4a0/Screen_Shot_2016-12-07_at_15.28.20.png) See merge request !7974
-
Sean McGivern authored
Use a single query in Projects::ProjectMembersController to fetch members See merge request !7997
-
Alejandro Rodríguez authored
Update "Installation from source" guide for 8.15.0 Following the steps from https://gitlab.com/gitlab-org/release-tools/blob/master/doc/release-candidates.md#creating-rc1. See merge request !8015
-