summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Fixed typo in css classDaniel Voogsgerd2016-10-262-1/+2
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed .visable-sm to .visible-sm Fixes #23745 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch 'issue-board-sidebar' into 'master' Fatih Acet2016-10-2635-48/+913
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue board sidebar ## What does this MR do? Adds a sidebar when clicking an issue in the issue boards lists. This allows user to easily update other parts of the issue details without having to visit the issue itself. Same functionality as on issue page. When creating a new issue the sidebar automatically opens. ## Screenshots (if relevant) ![Screen_Shot_2016-10-07_at_13.10.16](/uploads/ad08785f407d8ac3fe9cb078868a7839/Screen_Shot_2016-10-07_at_13.10.16.png) ## What are the relevant issue numbers? Closes #21219 See merge request !6690
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into issue-board-sidebarissue-board-sidebarPhil Hughes2016-10-26297-1539/+3583
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Moved avatar infront of labelsPhil Hughes2016-10-252-5/+9
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed height of sidebar causing scrolling issuesPhil Hughes2016-10-251-2/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fixed users profile link in sidebarPhil Hughes2016-10-254-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed new labels not being created Fixed scrolling issues
| * | | | | | | | | | | | Alignment of toggle buttonPhil Hughes2016-10-201-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into issue-board-sidebarPhil Hughes2016-10-2017-53/+172
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Added button typesPhil Hughes2016-10-202-2/+2
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Hides/shows the boards sidebarPhil Hughes2016-10-209-32/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than constructing & then deconstructing, we know just hide & show the sidebar. This is done so we dont' have a memory leak on the frontend with objects getting created.
| * | | | | | | | | | | | | Updated close sidebar iconPhil Hughes2016-10-193-3/+10
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into issue-board-sidebarPhil Hughes2016-10-19193-963/+3195
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Scroll board into view when clicking issuePhil Hughes2016-10-198-15/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed return statement instead of if Delete objects after issue is closed
| * | | | | | | | | | | | | | Tests updatePhil Hughes2016-10-191-2/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into issue-board-sidebarPhil Hughes2016-10-19808-7304/+16319
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fixed some JS stylingPhil Hughes2016-10-072-2/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed filter specsPhil Hughes2016-10-071-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Added tests for showing sidebar when new issue is savedPhil Hughes2016-10-072-0/+29
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Make the subscribe button work correctlyPhil Hughes2016-10-072-2/+7
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Restore subscribe status in JSONPhil Hughes2016-10-074-3/+15
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix issue when clicking links inside issue showing sidebarPhil Hughes2016-10-072-2/+6
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix JSON Schema that validates data returned by board issues endpointDouglas Barbosa Alexandre2016-10-072-1/+2
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Added testsPhil Hughes2016-10-074-3/+300
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed sidebar dropdowns to work with VuePhil Hughes2016-10-077-6/+24
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Styling updates to sidebar to match designPhil Hughes2016-10-072-5/+35
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Correct the issue update pathPhil Hughes2016-10-074-4/+4
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Hides sidebar when clicking same issuePhil Hughes2016-10-072-2/+7
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fixed issue with dragging opening the issue sidebarPhil Hughes2016-10-073-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added indicator when issue detail is visible
| * | | | | | | | | | | | | | | Sidebar details update when changingPhil Hughes2016-10-0718-49/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to get working the subscription Styling updates
| * | | | | | | | | | | | | | | Show clicked issue data in the sidebarPhil Hughes2016-10-0713-44/+147
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Added markup for sidebarPhil Hughes2016-10-077-7/+83
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch ↵Fatih Acet2016-10-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '21248-wrong-urlencoding-when-switching-branch-in-graphs-contributers' into 'master' Fix refs dropdown selection with special characters ## What does this MR do? Remove unneeded encode from the project-refs-dropdown renderRow method. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![2016-10-23_01.20.19](/uploads/1f176b2aa633093851799ae9f70f116b/2016-10-23_01.20.19.gif) ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] 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 #21248 See merge request !7061
| * | | | | | | | | | | | | | | | Remove encode from the project-refs-dropdown renderRow method21248-wrong-urlencoding-when-switching-branch-in-graphs-contributersLuke Bennett2016-10-231-1/+1
| | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'bugfix/fix_sidekiq_stats' into 'master' Robert Speicher2016-10-262-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Sidekiq process stats in admin area Closes #23825 See merge request !7116
| * | | | | | | | | | | | | | | | Fix sidekiq stats in admin areablackst0ne2016-10-262-1/+2
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'airat/gitlab-ce-23268-fix-milestones-filtering' into 'master'Robert Speicher2016-10-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix filtering of milestones with quotes in title Closes #23268 See merge request !6900
* | | | | | | | | | | | | | | | | Escape quotes in gl_dropdown values to prevent exceptionsAirat Shigapov2016-10-264-0/+36
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'users-should-remove-former-go-installation-folder' into 'master' Rémy Coutable2016-10-261-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | users should remove former Go installation folder ## What does this MR do? It ensure users installing or updating from source will remove their former Go installation folder in `/usr/local/go`, to avoid raising errors that could lead to new issues being created. ## Are there points in the code the reviewer needs to double check? 1. The `rm -rf` should not be verbose if folder does not exists. 1. May a user have some kind of configuration files in this folder ? ## Why was this MR needed? I did faced the error, that led me to the solution stated here : https://gitlab.com/gitlab-org/gitlab-workhorse/issues/29#note_4155517 gitlab-org/gitlab-workhorse#29 See merge request !6602
| * | | | | | | | | | | | | | | | | users should remove former Go installation folderPierre-Alexandre Clorichel2016-09-291-0/+3
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'joshua.welsh/gitlab-ce-fix_deploy_keys_regressions'Rémy Coutable2016-10-263-2/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See merge request !6784
| * | | | | | | | | | | | | | | | | | Fixes various errors when adding deploy keys caused by not exiting the ↵Joshua Welsh2016-10-263-2/+25
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | control flow. When adding a deploy key that already exists in the project the existing key would not be returned, resulting in an attempt to create a new one, which in turn caused a 500 error due to an ActiveRecord exception. When adding a deploy key that exists within another project the key would be joined to the project, but would also attempt to create a new one, which resulted in a 400 error due to the key already existing. Fixes #22741 Fixes #21754 Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | | Merge branch 'samrose3/gitlab-ce-help-ui-alerts-url-fix'Rémy Coutable2016-10-262-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See merge request !6915
| * | | | | | | | | | | | | | | | | Fix typo on /help/ui to Alerts sectionSam Rose2016-10-262-1/+2
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | Merge branch 'grapify-tags' into 'master' Rémy Coutable2016-10-261-49/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify tags API ## What does this MR do? Add the Grape-DSL to the tags API. ## Are there points in the code the reviewer needs to double check? The delete endpoint only has a description but no success entity because we don't have one. We only return the branch name as JSON. Should I do something else? ## What are the relevant issue numbers? Related to #22928 See merge request !6860
| * | | | | | | | | | | | | | | | Grapify tags APIgrapify-tagsRobert Schilling2016-10-261-49/+45
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Add 8.13.1 CHANGELOG entriesRémy Coutable2016-10-261-17/+22
| |_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | Merge branch 'sh-fix-ajax-spec-failure' into 'master' Stan Hu2016-10-261-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove use of wait_for_ajax since jQuery was removed Fixes #23812 See merge request !7111
| * | | | | | | | | | | | | | | | Remove use of wait_for_ajax since jQuery was removedsh-fix-ajax-spec-failureStan Hu2016-10-251-3/+0
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #23812
* | | | | | | | | | | | | | | | Merge branch 'replace-jquery-cookie-plugin' into 'master' Alfredo Sumaran2016-10-2620-111/+187
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace jquery-cookie plugin with js-cookie ## What does this MR do? Removes an outdated and unmaintained dependency [jquery.cookie](https://github.com/carhartl/jquery-cookie) with its successor [js.cookie](https://github.com/js-cookie/js-cookie) which is not dependent on jQuery. Also this MR adds a global default cookie `path` setting which defaults to the GitLab root directory. Now, setting a cookie to any path other than `gon.relative_url_root` requires an explicit opt-out. This is a sensible default and should prevent accidental omission going forward. ## Are there points in the code the reviewer needs to double check? Double check that all instances of `$.cookie(x)` have been replaced by `Cookies.get(x)` and all instances of `$.cookie(x, y, z)` are replaced with `Cookies.set(x, y, z)`. All javascripts which set or retrieve cookie values should function just as before. ## Why was this MR needed? One more step toward shaking off jQuery as a dependency (#23022), also [jquery.cookie](https://github.com/carhartl/jquery-cookie) is no longer maintained and hasn't seen an update in 2+ years. ## 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? #23022 See merge request !7085
| * | | | | | | | | | | | | | | update CHANGELOG.md to reflect !7085replace-jquery-cookie-pluginMike Greiling2016-10-241-0/+1
| | | | | | | | | | | | | | | |