- 14 12月, 2016 1 次提交
- 12 12月, 2016 12 次提交
-
-
由 Lin Jen-Shin 提交于
* upstream/master: API: Fix groups filter fix: removed signed_out notification Fix typo in curl example request Fix typo Change docs title to represent the edition remove left_align setting from notification setting dropdown in favor of a pure css solution fix alignment for notification settings ajax response [ci skip] Update "Installation from source" guide for 8.15.0 Group links spec update Stop replacing `$your_email` with the user's email Updates the font weight of button styles because of the change to system fonts Updated JS based on review Fixed group links dropdown to match Allow branch names with dots on API endpoint Use a single query in Projects::ProjectMembersController to fetch members Use gitlab-workhose 1.1.1 Updated members dropdowns Use default btn styling for Housekeeping button on projects settings page fix display hook error message API: Endpoint to expose personal snippets as /snippets Removed leave buttons from settings dropdowns
-
由 Lin Jen-Shin 提交于
It's very weird that source_commit.raw_commit and rugged.branches[merge_request.target_branch].target should be completely the same. I checked with == and other values which proved that both should be the same, but still tests cannot pass for: spec/services/merge_requests/refresh_service_spec.rb I decided to give it up. We could just use SHA and that works fine anyway.
-
由 Rémy Coutable 提交于
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
-
由 Sean McGivern 提交于
Allow branch names with dots on API endpoint closes #25030 See merge request !7963
-
由 Robert Schilling 提交于
-
由 Sean McGivern 提交于
fix: 25294 - remove signed_out notification Closes #25294 See merge request !7958
-
由 Fatih Acet 提交于
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 提交于
test: replaced signed_out message check with check for sign_in button fixes #25294
-
由 Sean McGivern 提交于
Adding support for personal snippet endpoint on the API Closes #22042 See merge request !6373
-
由 Sean McGivern 提交于
Fix typo See merge request !8029
-
由 Robert Schilling 提交于
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 提交于
-
- 11 12月, 2016 3 次提交
-
-
由 Ismail S 提交于
-
由 Achilleas Pipinellis 提交于
Change docs title to represent the edition See merge request !8026
-
由 Achilleas Pipinellis 提交于
-
- 10 12月, 2016 18 次提交
-
-
由 Mike Greiling 提交于
-
由 Mike Greiling 提交于
-
由 Alfredo Sumaran 提交于
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 提交于
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 提交于
Stop replacing `$your_email` with the user's email in the `/help` pages See merge request !8014
-
由 Jacob Schatz 提交于
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 提交于
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 提交于
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 提交于
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 提交于
Use a single query in Projects::ProjectMembersController to fetch members See merge request !7997
-
由 Alejandro Rodríguez 提交于
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
-
-
由 Lin Jen-Shin 提交于
* upstream/master: (60 commits) Refactor SSH keys docs Improvements to setting up ssh Do not reload diff for merge request made from fork when target branch in fork is updated Add 8.12.10, 8.12.11, and 8.12.12 CHANGELOG.md items Changes after review Fix broken test Adds CHANGELOG entry Adds tests Uniformize props name format Replace commit icon svg logic Replace play icon svg logic Update docs to reflect new defaults on omnibus Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security' Merge branch 'html-safe-diff-line-content' into 'security' Merge branch 'rs-filter-authentication_token' into 'security' Merge branch 'destroy-session' into 'security' remove unnecessary issues event filter on comments tab Updating reference to database password Add CHANGELOG entry Displays milestone remaining days only when it's present ...
-
由 Lin Jen-Shin 提交于
-
由 Fatih Acet 提交于
Resolve "Provide SVG as a prop instead of hiding and copy them in environments table" ## What does this MR do? - Provides SVG as a prop instead of manually manipulate the DOM to show it - Uniforms all props names in environments related components, 3 formats were being used and it was error prone - Adds tests for the new SVG props. ## Why was this MR needed? Technical debt. ## 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 #25374 See merge request !7992
-
由 Lin Jen-Shin 提交于
-
由 Phil Hughes 提交于
-
由 Rémy Coutable 提交于
The `$your_email` was removed from the SSH doc. Signed-off-by: NRémy Coutable <remy@rymai.me>
-
- 09 12月, 2016 6 次提交
-
-
由 Dimitrie Hoekstra 提交于
-
由 Sean McGivern 提交于
Displays milestone remaining days only when it's present See merge request !7998
-
由 Sean McGivern 提交于
Do not reload diff for merge request made from fork when target branch in fork is updated Closes #25263 See merge request !7973
-
由 Rémy Coutable 提交于
API: Ability to remove source branch Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/23577 See merge request !7804
-
由 Sean McGivern 提交于
Fix comments tab disappearing Fixes #25272 See merge request !7913
-
由 Sean McGivern 提交于
Render SVG images in notes Closes #24937 See merge request !7747
-