- 09 12月, 2016 24 次提交
-
-
由 Achilleas Pipinellis 提交于
Update JIRA troubleshoot documentation closes #25152 See merge request !7977
-
由 Achilleas Pipinellis 提交于
Improvements to setting up SSH documentation ## What does this MR do? Improves the documentation article on setting up SSH. * Added introduction * Added additional explanations * Added sub headings * Moved sections around * Added section about generating an SSH key pair on Windows with PuttyGen (will be expanded further in future) Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24708 See merge request !6571
-
由 Achilleas Pipinellis 提交于
[ci skip]
-
由 Sean Packham 提交于
-
由 Sean Packham 提交于
Update docs to reflect new defaults on omnibus ## What does this MR do? Updates docs, after gitlab-org/omnibus-gitlab!1154 the flow has changed. See merge request !8006
-
由 Rémy Coutable 提交于
[ci skip] Signed-off-by: NRémy Coutable <remy@rymai.me>
-
由 Fatih Acet 提交于
Fix active nav badges not inheriting the link color ## What does this MR do? Fix active navigation and tabs badges not inheriting the link color (in this case, black). ## Screenshots (if relevant) ![image](/uploads/ab4e8ea99531106f9ddc4297e10c327b/image.png) ## 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) See merge request !7950
-
由 Fatih Acet 提交于
Fixed Wrong Tab Selected When Loggin Fails And Multiple Login Tabs Exists ## What does this MR do? Fixes issue: 15081 Wrong Tab Selected When Loggin Fails And Multiple Login Tabs Exists This is done by saving into a cookie when the active tab changes and by always selecting that tab when the page is loaded. ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? In order to fix the issue: 15081 ## Screenshots (if relevant) ## 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 #15081 See merge request !7314
-
由 Z.J. van de Weg 提交于
For mattermost chat commands, new defaults are set in the next release making configuring easier. This commit reflects that in the doc. [ci skip]
-
由 Achilleas Pipinellis 提交于
Updating reference to database password ## What does this MR do? Updates references to postgresql['sql_password'] to use gitlab_rails['db_password'] instead. Original value is not used anywhere. For gitlab-org/omnibus-gitlab#1392 we're using gitlab_rails['db_password'] to create a .pgpass as needed. See merge request !8000
-
由 Robert Speicher 提交于
-
由 Douwe Maan 提交于
Add nested groups support on data level ## What does this MR do? - [x] Add `parent_id` field to `Namespace`model. - [x] Create new database table `routes` that keeps information about full path to each group or project - [x] Remove uniq index from `namespaces.path` - [x] Add uniq index on `routes.path` - [x] Fill routes table with path data from namespaces and projects - [x] Change Namespace/Project URL lookup by routes table - [x] Rename related routes (nested groups, projects) when parent path changes This is solely backend preparation. UI, Permissions and API support will be added in separate merge request. ## Are there points in the code the reviewer needs to double check? migrations, Route model, Routable concern Will require downtime. See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7121#note_19490281 discussion ## Why was this MR needed? One step further to full nested groups support ## Screenshots (if relevant) No UI changes in this merge request so far ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry 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? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !7121
-
由 Douwe Maan 提交于
Replace MR access checks with use of MergeRequestsFinder Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867
⚠ - Potentially untested💣 - No test coverage🚥 - Test coverage of some sort exists (a test failed when error raised)🚦 - Test coverage of return value (a test failed when nil used)✅ - Permissions check tested - [x]💣 app/finders/notes_finder.rb:17 - [x]⚠ app/views/layouts/nav/_project.html.haml:80 [`.count`] - [x]💣 app/controllers/concerns/creates_commit.rb:84 - [x]🚥 app/controllers/projects/commits_controller.rb:24 - [x]🚥 app/controllers/projects/compare_controller.rb:56 - [x]🚦 app/controllers/projects/discussions_controller.rb:29 - [x]✅ app/controllers/projects/todos_controller.rb:27 - [x]🚦 app/models/commit.rb:268 - [x]✅ lib/gitlab/search_results.rb:71 - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_267_266 Memoize ` merged_merge_request(current_user)` - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_248_247 Expected side effect for `merged_merge_request!`, consider `skip_authorization: true`. - [x] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#d1c10892daedb4d4dd3d4b12b6d071091eea83df_269_269 Scary use of unchecked `merged_merge_request?` See merge request !2033 -
由 Robert Speicher 提交于
Don't accidentally mark unsafe diff lines as HTML safe Fixes potential XSS issue when a legacy diff note is created on a merge request whose diff contained HTML See https://gitlab.com/gitlab-org/gitlab-ce/issues/25249 See merge request !2040
-
由 Douwe Maan 提交于
Add authentication_token to filter_parameters list See merge request !2041
-
由 Robert Speicher 提交于
Destroy a user session when they delete their own account via browser This patch destroys a user's session when they delete their own account using a browser. A new session is created as they are redirected to the sign_in page. Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/25015 See merge request !2042
-
由 Fatih Acet 提交于
Fix JS error when reseting new issue template Fixes JS error when trying to reset template when no template has been set. See merge request !7978
-
由 Ian Baum 提交于
postgresql['sql_password'] is not used, should be gitlab_rails['db_password']
-
由 Fatih Acet 提交于
Fade out should be white instead of gray Currently, you can see the hard edge of the fade out because it's a light shade of gray rather than white. Before: ![Screen_Shot_2016-12-07_at_12.36.10_PM](/uploads/c8fd2c6ba1742d1260614fd4c9cb29c9/Screen_Shot_2016-12-07_at_12.36.10_PM.png) After: ![Screen_Shot_2016-12-07_at_12.35.53_PM](/uploads/52b51e4a825658a0c440e0f1fb86a31c/Screen_Shot_2016-12-07_at_12.35.53_PM.png) cc @nmrony See merge request !7979
-
由 Fatih Acet 提交于
Various small emoji positioning adjustments ## What does this MR do? It changes various emoticon related css rules with very small minor tweaks of 1 or 2 px ## Are there points in the code the reviewer needs to double check? - ## Why was this MR needed? aesthetics ## Screenshots (if relevant) - ## 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? none See merge request !7993
-
由 Fatih Acet 提交于
Fixed timeago re-rendering every element ## What does this MR do? Fixes an issue when new notes are added timeago will be initialised for every timeago element on the page again and therefore adding more timeouts. See merge request !7969
-
由 Felipe Artur 提交于
-
由 Alejandro Rodríguez 提交于
[ci skip]
-
由 Alejandro Rodríguez 提交于
[ci skip]
-
- 08 12月, 2016 16 次提交
-
-
由 Rémy Coutable 提交于
Refine pipeline stages ## What does this MR do? Introduces a concept of `Ci::Stage` to make it easier to have detailed statuses. ## Why was this MR needed? This is needed to simplify the handling of `Ci::Statuses` and make the `Stage` actual concept in code: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7889 See merge request !7927
-
由 Sean McGivern 提交于
Remove wrong '.builds-feature' class from the MR settings fieldset Closes #25171 See merge request !7930
-
由 Sean McGivern 提交于
Closes #24982 See merge request !7837
-
由 Sean McGivern 提交于
Don't whitelist events for all filter Closes #24826 See merge request !7673
-
由 Sean McGivern 提交于
Remove unnecessary target branch link from MR page in case of deleted target branch Fixes #24507 See merge request !7916
-
由 Kamil Trzcinski 提交于
-
由 Sean McGivern 提交于
Shows group members in the project members list Closes #24122 See merge request !7899
-
由 Rémy Coutable 提交于
Update factory_girl_rails to 4.7.0 Changes: https://github.com/thoughtbot/factory_girl/blob/master/NEWS See merge request !7986
-
由 Annabel Dunstone Gray 提交于
Enable display of admonition icons in Asciidoc. ## What does this MR do? Enables admonition icons to display in rendered asciidoc documents. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Gitlab support of asciidoc needs a lot of improvements to make it useful in enterprise settings. ## Screenshots (if relevant) ![Screenshot_20161129_132250](/uploads/d280336000eb8b445d07d9bb2a2ed639/Screenshot_20161129_132250.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 - [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? See merge request !7812
-
由 Rémy Coutable 提交于
Correct previous stable branch used in 8.14 to 8.15 update guide [ci skip] See merge request !7984
-
由 Dimitrie Hoekstra 提交于
-
由 Dmitriy Zaporozhets 提交于
* add parent_id field to namespaces table to store relation with nested groups * create routes table to keep information about full path of every group and project * project/group lookup by full path from routes table Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
由 Robert Speicher 提交于
-
由 Douwe Maan 提交于
Allow public access to some Tag API endpoints Continuation of #4269. See merge request !7896
-
由 Douwe Maan 提交于
Reenables /user API request to return private-token if user is admin and requested with sudo ## What does this MR do? Reenables the API /users to return `private-token` when sudo is either a parameter or passed as a header and the user is admin. ## Screenshots (if relevant) Without **sudo**: ![Screen_Shot_2016-11-21_at_11.44.49](/uploads/ebecf95dbadaf4a159b80c61c75771d9/Screen_Shot_2016-11-21_at_11.44.49.png) With **sudo**: ![Screen_Shot_2016-11-21_at_11.45.52](/uploads/f25f9ddffcf2b921e9694e5a250191d3/Screen_Shot_2016-11-21_at_11.45.52.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] 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 #24537 See merge request !7615
-
由 Robert Speicher 提交于
[ci skip]
-