summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '20052-actions-table-vscroll' into 'master' Annabel Dunstone Gray2016-12-132-13/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent overflow with vertical scroll when we have space to show content ## What does this MR do? Removes vertical and horizontal scroll from builds, environments and pipelines tables by adding a media query since this is only necessary in smaller screens. ## Screenshots (if relevant) ![scroll](/uploads/6b9e3584df6e4ca29553d2ff576b794e/scroll.jpg) ## 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 - [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 #20052 See merge request !8061
| * Prevent overflow with vertical scroll when we have space to show content20052-actions-table-vscrollFilipa Lacerda2016-12-132-13/+12
| | | | | | | | Adds changelog
* | Merge branch 'backport/group-policies' into 'master' Rémy Coutable2016-12-132-0/+12
|\ \ | | | | | | | | | | | | | | | | | | Backport hooks on group policies for the EE-specific implementation See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/822#note_19955431 See merge request !8066
| * | Backport hooks on group policies for the EE-specific implementationbackport/group-policiesDouglas Barbosa Alexandre2016-12-132-0/+12
| | |
* | | Merge branch 'jzinn/gitlab-ce-chomp-git-status-message' into 'master' Rémy Coutable2016-12-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For single line Git commit messages, the close quote should be on the same line as the open quote _Originally opened at !7299 by @jzinn._ - - - ## What does this MR do? Chomps merge commit messages so that there is not a dangling close quote. A better solution would be not to use quotes at all, but to set off the message in a `<div>` with a background color. ## Screenshots (if relevant) ![Screen_Shot_2016-11-04_at_8.06.54_PM](/uploads/6e749c5227d88a9bfea64e70cccaf14a/Screen_Shot_2016-11-04_at_8.06.54_PM.png) See merge request !7975
| * | | For single line git commit messages, the close quote should be on the same ↵jzinn/gitlab-ce-chomp-git-status-messageJulian Zinn2016-12-131-1/+1
| | |/ | |/| | | | | | | | | | | | | line as the open quote Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch '25482-fix-api-sudo' into 'master' Sean McGivern2016-12-131-4/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | API: Memoize the current_user so that the sudo can work properly Closes #25482 See merge request !8017
| * | | Be smarter when finding a sudoed user in API::Helpers25482-fix-api-sudoRémy Coutable2016-12-131-4/+0
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch '25518-uniquely-style-labels' into 'master' Fatih Acet2016-12-133-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added border-radius and padding to labels ## What does this MR do? It creates a pill like style for labels. ## Are there points in the code the reviewer needs to double check? - ## Why was this MR needed? get a unique label look/style ## Screenshots (if relevant) ![image](/uploads/2cf347984ae4e36cd061c5a761ee99c9/image.png) ![image](/uploads/c23bbeba4b2525b4f36dac5a0fa1037c/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) ## What are the relevant issue numbers? Closes #25518 See merge request !8054
| * | | | added border-radius and padding to labels25518-uniquely-style-labelsDimitrie Hoekstra2016-12-133-1/+4
| | | | |
* | | | | Merge branch 'dz-nested-group-improvements-2' into 'master' Sean McGivern2016-12-131-3/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Minor improvements to nested groups code See merge request !8011
| * | | | Rename Routable.where_paths_in to Routable.where_full_path_indz-nested-group-improvements-2Dmitriy Zaporozhets2016-12-111-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Validate presence of route by Routable concernDmitriy Zaporozhets2016-12-111-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch '3478-copy-commit-hash-to-clipboard' into 'master' Sean McGivern2016-12-134-16/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy commit hash to clipboard Closes #3478 See merge request !8020
| * | | | | Tweak style and add back wordingvictorwu2016-12-121-1/+2
| | | | | |
| * | | | | Clean up commit copy to clipboard and make consistentvictorwu2016-12-124-15/+6
| | |/ / / | |/| | |
* | | | | Merge branch ↵Fatih Acet2016-12-133-4/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24949-view-2-up-swipe-onion-skin-controls-for-merge-request-diff-containing-an-image' into 'master' Add image controls to MR diffs ## What does this MR do? Instantiates `ImageFile` in `Diff` which is instantiated in `MergeRequestTabs`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-12-04_at_11.11.21](/uploads/738c68ad3fa682c1c132421abce7165e/Screen_Shot_2016-12-04_at_11.11.21.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) ## What are the relevant issue numbers? Closes #24949 See merge request !7919
| * | | | | Instantiate ImageFile for diff-files in Diff24949-view-2-up-swipe-onion-skin-controls-for-merge-request-diff-containing-an-imageLuke "Jared" Bennett2016-12-043-4/+7
| | | | | |
* | | | | | Merge branch 'issue_13270' into 'master' Sean McGivern2016-12-131-1/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to delete tag release note closes #13270 See merge request !8001
| * | | | | | Allow to delete tag release noteissue_13270Felipe Artur2016-12-121-1/+8
| | | | | | |
* | | | | | | Merge branch '25155-fix-edited-text-in-comments' into 'master' Fatih Acet2016-12-121-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | break comment "edited at" block out of the note-text element to prevent issues w… ## What does this MR do? Moves "edited" text below a note into its own element apart from rendered markdown to prevent issues when it is preceded by an inline text node. ## Are there points in the code the reviewer needs to double check? to reproduce the bug, add text immediately following an image in a note's markdown like so: ```markdown ![foo](/uploads/c6f86574e5c3b5b73e91eeccbcb06fe6/foo.png) test text here ``` then edit and save the note. ## Why was this MR needed? ## Screenshots (if relevant) Before: ![Screen_Shot_2016-12-12_at_1.01.59_PM_copy](/uploads/c6f86574e5c3b5b73e91eeccbcb06fe6/Screen_Shot_2016-12-12_at_1.01.59_PM_copy.png) After: ![Screen_Shot_2016-12-12_at_1.00.47_PM_copy](/uploads/7a6d86d1c415114b05b4c7b662f97e93/Screen_Shot_2016-12-12_at_1.00.47_PM_copy.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 - [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 #25155 See merge request !8048
| * | | | | | | break comment "edited at" block out of the note-text element to prevent ↵25155-fix-edited-text-in-commentsMike Greiling2016-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues with inline text nodes
* | | | | | | | Merge branch '25286-customer-label-doesn-t-autocomplete-correctly' into ↵Alfredo Sumaran2016-12-121-10/+11
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Correct autocomplete for values with special characters ## What does this MR do? This adds a check for any special chars in any value passed to the `DefaultOptions.beforeInsert` callback function. If special chars are found and `skipSpecialCharTest` option is `false`, it will wrap the value in quotation marks. This fixed autocompleting `~customer+` instead of `~"customer+"`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![2016-12-03_10.37.11](/uploads/59159623638939933d23b447692775b8/2016-12-03_10.37.11.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 #25286, #24961 See merge request !7910
| * | | | | | | Added special char test to the default beforeInsert callback. I removed the ↵25286-customer-label-doesn-t-autocomplete-correctlyLuke "Jared" Bennett2016-12-081-10/+11
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | quotes from the milestone displayTpl and added a skip setting for emoji instance Review changes
* | | | | | | Merge branch '19550-fix-contributer-graph-duplicates' into 'master' Alfredo Sumaran2016-12-121-4/+7
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "contributor emails in contributors graphs is case sensitive" ## What does this MR do? changes author email to a case insensitive comparison so emails like "Somebody@foo.com" and "somebody@foo.com" are treated as a single author in contribution graphs. ## Are there points in the code the reviewer needs to double check? should be pretty simple ## Why was this MR needed? see above description ## Screenshots (if relevant) #### before: ![before](/uploads/873a073e8d31e1094da6f050ba3e3f51/before.png) #### after: ![after](/uploads/b9e534755615994f3e58442141c17f86/after.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~~ - [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 #19550 See merge request !8021
| * | | | | | normalize author email so we can treat it as case insensitiveMike Greiling2016-12-101-4/+7
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '25106-hide-issue-mr-button-for-not-loggedin' into 'master' Fatih Acet2016-12-122-5/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hide new issue or MR button for not signed users for a group ## What does this MR do? This MR prevents user creating issues or MR without signing in ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? This issue is needed to ensure an user to be logged in before creating an issue or MR ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] All builds are passing - [x] 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 #25106 See merge request !7902
| * | | | | | removes extra if check25106-hide-issue-mr-button-for-not-loggedinNur Rony2016-12-121-5/+4
| | | | | | |
| * | | | | | hides new MR button from not loggedin userNur Rony2016-12-121-2/+3
| | | | | | |
| * | | | | | adds check for logged in user in group issuesNur Rony2016-12-121-7/+8
| |/ / / / /
* | | | | | Merge branch '19990-update-snippets-page-design' into 'master' Fatih Acet2016-12-1215-119/+161
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Updated UI for Snippets pages" ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## 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 - [ ] 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 #19990 See merge request !7861
| * | | | | | rename snippets_path helper due to conflict19990-update-snippets-page-designMike Greiling2016-12-102-5/+5
| | | | | | |
| * | | | | | use Snippet.none in favor of nil to allow chainingMike Greiling2016-12-101-1/+1
| | | | | | |
| * | | | | | implement snippets_scope_menu partial to reduce code duplicationMike Greiling2016-12-104-53/+45
| | | | | | |
| * | | | | | refactor duplicate code into a by_scope methodMike Greiling2016-12-101-35/+19
| | | | | | |
| * | | | | | move snippet edited timeago under the snippet titleMike Greiling2016-12-102-8/+14
| | | | | | |
| * | | | | | fix snippets reference id in search results (should be $ not #)Mike Greiling2016-12-101-1/+1
| | | | | | |
| * | | | | | conditionally display assoc project info in snippets indexMike Greiling2016-12-104-4/+13
| | | | | | |
| * | | | | | fix failing testsMike Greiling2016-12-101-2/+2
| | | | | | |
| * | | | | | update snippets list designMike Greiling2016-12-102-13/+20
| | | | | | |
| * | | | | | ensure all snippets count badge is accurate for non team membersMike Greiling2016-12-101-1/+4
| | | | | | |
| * | | | | | move project new snippet button into snippet scope navigation headerMike Greiling2016-12-101-27/+31
| | | | | | |
| * | | | | | add scope filters to project snippets pageMike Greiling2016-12-103-7/+52
| | | | | | |
| * | | | | | move new snippet button to main snippet navigation blockMike Greiling2016-12-103-48/+42
| | | | | | |
| * | | | | | remove plus icon in "new snippet" buttonMike Greiling2016-12-101-2/+0
| | | | | | |
| * | | | | | invert snippet action buttonsMike Greiling2016-12-102-4/+4
| | | | | | |
| * | | | | | remove unused class nameMike Greiling2016-12-102-4/+4
| | | | | | |
| * | | | | | update action button order for snippets pageMike Greiling2016-12-102-12/+12
| |/ / / / /
* | | | | | Merge branch 'grapify-service-api' into 'master' Rémy Coutable2016-12-125-15/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify the service API Related to #22928 See merge request !7970
| * | | | | | Grapify the service APIRobert Schilling2016-12-095-15/+18
| | | | | | |