- 14 Nov, 2016 26 commits
-
-
Lin Jen-Shin authored
If `source_branch` option is passed, and target branch cannot be found, `Repository#update_branch_with_hooks` would try to create a new branch from `source_branch`. This way, we could make changes in the new branch while only firing the hooks once for the changes. Previously, we can only create a new branch first then make changes to the new branch, firing hooks twice. This behaviour is bad for CI. Fixes #7237
-
Lin Jen-Shin authored
This reverts commit a431ca0f.
-
Lin Jen-Shin authored
* upstream/master: (280 commits) Use declared_params helper in API Fixed issue boards when not logged in Fix typos and grammar Fix indentation in CI variables entry class Link to correct version of SanitizationFilter API docs for whitelist Use #to_h to convert params to a hash Grapify subscription API Change name of method for setting CI config entries Improve naming convention in ci configuration module Only turn on Sidekiq throttling if application settings exists Fix link to index.md in development README.md use single quote for consistency Also test on dev.gitlab [ci skip] Only run builds on master of CE or EE fix error links in help page Remove unneeded nil checks Remove hover state on location badge. Added ability to put emojis into repository name update redis server details fix Super User spacing ...
-
Rémy Coutable authored
Use declared_params helper in API Related to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7406#note_18275781 See merge request !7455
-
Fatih Acet authored
Fixed issue boards when not logged in ## What does this MR do? This managed to get through because their wasn't actually any tests for loading the lists when a user is not logged in. This fixes that by adding a test & also fixing the template not correctly compiling under VueJS v2. See merge request !7452
-
Annabel Dunstone Gray authored
Project download buttons always show ## What does this MR do? Removes `hidden-xs hidden-sm` classes from `download-button` so it doesn’t hide itself individually from the rest of the `project-repo-buttons` block ## Why was this MR needed? Fixes #23960. Not sure why this element had these classes in the first place, but at the very least we shouldn’t be hiding the Download button at the `hidden-sm` threshold since that’s still fairly large viewport and users with viewports of that size likely still want to download source code. ## Screenshots (if relevant) Screenshots taken at ~830px width __Before__ ![before](/uploads/21955cf7a12f6eb9cfef96bbb27b7110/before.png) __After__ ![after](/uploads/c082884f225184d56a920adbc0a0a732/after.png) ## What are the relevant issue numbers? #23960 See merge request !7405
-
Robert Schilling authored
-
Rémy Coutable authored
Use to_h to convert params to a hash See merge request !7406
-
Rémy Coutable authored
Fix typos and grammar errors See the general Documentation guidelines http://docs.gitlab.com/ce/development/doc_styleguide.html See merge request !7451
-
Phil Hughes authored
-
Kamil Trzciński authored
Improve naming convention in ci configuration module ## What does this MR do? This MR improves the naming convention in CI configuration module to reflect the domain design better. ## What are the relevant issue numbers? Related to #15060 See merge request !7448
-
Rémy Coutable authored
Grapify subscription API ## What are the relevant issue numbers? Related to #22928 See merge request !7380
-
seongahjo authored
-
Grzegorz Bizon authored
-
Rémy Coutable authored
Fix error links in help index page when access it with url `http://gitlab.example.com/help/` which have an extra slash Fixes #24349 See merge request !7396
-
Robert Speicher authored
Only turn on Sidekiq throttling if column exists If the database has not been migrated properly, the initializer for Sidekiq will fail to start and cause the whole Rails server to crash. This change checks the existence for the column and allows Rails to start even if the setting has not been added as a database column. Closes #24452 See merge request !7446
-
Robert Speicher authored
[ci skip]
-
Rémy Coutable authored
Centralized all LDAP config logic in to `Gitlab::LDAP::Config`. We had varying configuration for devise/omniauth and other things. For example, `user_filter` was never taken in to account for devise/omniauth so a user object would always be created, even if the user did not match the user_filter. Fixes gitlab-org/gitlab-ce#21195, https://gitlab.com/gitlab-org/gitlab-ce/issues/15396 and gitlab-org/gitlab-ce#13296 See merge request !6606
-
Robert Schilling authored
-
Robert Speicher authored
Remove unneeded nil checks See merge request !7437
-
Robert Speicher authored
Fix project Visibility level selector not using default values closes #20245 See merge request !7264
-
Robert Schilling authored
-
Rémy Coutable authored
Added ability to put emojis into repository name ## Are there points in the code the reviewer needs to double check? Ensure that regexp used is correct, I used the following list: http://www.unicode.org/Public/emoji/1.0/emoji-data.txt See merge request !7420
-
Grzegorz Bizon authored
-
Grzegorz Bizon authored
-
Sean McGivern authored
use single quote for consistency See merge request !7442
-
- 13 Nov, 2016 3 commits
-
-
Kamil Trzciński authored
Resolve "Link from build page to its pipeline" ## What does this MR do? Adds references and links to a build's pipeline within both individual build pages and the build index. ## Are there points in the code the reviewer needs to double check? Nothing springs to mind ## Why was this MR needed? See #22307 ## Screenshots (if relevant) ![Screen_Shot_2016-10-24_at_3.45.39_PM_copy](/uploads/e6e8745a0a39d8b71c007e7df5fbd051/Screen_Shot_2016-10-24_at_3.45.39_PM_copy.png) ![Screen_Shot_2016-10-24_at_3.46.03_PM_copy](/uploads/3e2eb656347751f10bf62891b56ebcc7/Screen_Shot_2016-10-24_at_3.46.03_PM_copy.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) 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 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 #22307 See merge request !7082
-
Kamil Trzciński authored
Only run builds on master of CE or EE This should reduce builds run by projects still running all pipelines for CE See merge request !6869
-
Stan Hu authored
If the database has not been migrated properly, the initializer for Sidekiq will fail to start and cause the whole Rails server to crash. This change checks the existence for the column and allows Rails to start even if the setting has not been added as a database column. Closes #24452
-
- 12 Nov, 2016 11 commits
-
-
Achilleas Pipinellis authored
Fix link to index.md UX guide in development README.md Fix wrong link to UX docs that introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7142 See merge request !7444
-
Achilleas Pipinellis authored
[ci skip]
-
Ben Bodenmiller authored
-
Fatih Acet authored
Improvements to hover/active/focus states in header items ## What does this MR do? Adds some improvements to buttons, dropdowns, inputs, etc. in the header area. ## Are there points in the code the reviewer needs to double check? I'm not sure. ## Why was this MR needed? Requested in an issue. ## Screenshots (if relevant) ![caret](/uploads/574135282e4b2e81476fdd6dd6c1c05d/caret.gif)![hover](/uploads/15a3b8a2aa89baf20270be97c452e006/hover.gif) ## 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 - [ ] 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 #24202 This is not complete yet. I'm new to this, so please let me know what all steps do I need to do (tests, changelog, etc.). See merge request !7412
-
Sean McGivern authored
Fix record not found error on NewNoteWorker processing Resolves #22678 See merge request !6863
-
Sean McGivern authored
fix Super User spacing See merge request !7433
-
Sean McGivern authored
update redis server details See merge request !7436
-
Z.J. van de Weg authored
-
Z.J. van de Weg authored
-
Fu Xu authored
-
Z.J. van de Weg authored
The library we're using, default_value_for, is configured to interpret nil as the default value, being ENABLED. Given the property can't be nil this check is unneeded.
-