summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fix Slack pipeline message by APIfix-slack-pipeline-message-by-apiLin Jen-Shin2016-12-131-1/+1
| | | | | | | | Pipelines triggered from API don't have a corresponding user, so we show that it's from API, same as from the web UI Closes #25609
* 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
| | | | | |
* | | | | | Merge branch '25429-fix-awkward-wording-in-cherry-pick-and-revert-errors' ↵Alfredo Sumaran2016-12-122-6/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Fix awkward wording in "cherry-pick" and "revert" errors." ## What does this MR do? Fixes a poorly worded error message as well as some other minor bugs I encountered while investigating #21812. ## Are there points in the code the reviewer needs to double check? Should be pretty straight forward. ## 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 - [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? Originally a part of #21812 Closes #25429 See merge request !7981
| * | | | | prevent create_merge_request form field helpers from generating an id value25429-fix-awkward-wording-in-cherry-pick-and-revert-errorsMike Greiling2016-12-101-2/+2
| | | | | |
| * | | | | fix awkward verb conjugation in cherry-pick and revert errorsMike Greiling2016-12-101-1/+1
| | | | | |
| * | | | | remove unnecessary nonce idMike Greiling2016-12-101-3/+2
| | | | | |
| * | | | | fix broken string interpolationMike Greiling2016-12-101-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch '25483-broken-tabs' into 'master' Fatih Acet2016-12-125-9/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix TypeError: Cannot read property 'initTabs' ## What does this MR do? Adds a default value to the `options` argument in order to prevent errors when `Pipelines` is initialised without arguments. Adds tests to guarantee this does not happen again. Adds back removed pipeline class to make the pipeline graph visible, `js-pipeline-graph` ## Why was this MR needed? In the places where `Pipelines` is initialised without arguments it throws an error: `TypeError: Cannot read property 'initTabs'` ## 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 #25483 Closes #25493 See merge request !8009
| * | | | | Fix tests25483-broken-tabsFilipa Lacerda2016-12-124-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | Fix broken tests
| * | | | | Fix Pipeline graph disappeared from the builds tab in commits and merge ↵Filipa Lacerda2016-12-122-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | request views
| * | | | | Adds tests to prevent future errors.Filipa Lacerda2016-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix undefined variable in es5
| * | | | | Fix TypeError: Cannot read property 'initTabs'Filipa Lacerda2016-12-121-1/+1
| | | | | |
* | | | | | Added hiddenInterval and immediateExecution settings, fixed visibilitychange ↵24807-stop-ddosing-ourselvesLuke "Jared" Bennett2016-12-122-70/+73
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | listening, implemented with mr widget Updated tests Added tests Review changes
* | | | | Merge branch '25294-remove-signed-out-msg' into 'master' Sean McGivern2016-12-121-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix: 25294 - remove signed_out notification Closes #25294 See merge request !7958
| * | | | | fix: removed signed_out notificationjnoortheen2016-12-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test: replaced signed_out message check with check for sign_in button fixes #25294
* | | | | | Merge branch '25510-fix-notifications-dropdown-alignment' into 'master' Fatih Acet2016-12-125-5/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | remove left_align setting from notification setting dropdown in favor of a ↵25510-fix-notifications-dropdown-alignmentMike Greiling2016-12-106-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | pure css solution
| * | | | | fix alignment for notification settings ajax responseMike Greiling2016-12-091-1/+5
| |/ / / /
* | | | | Merge branch 'features/api-snippets' into 'master' Sean McGivern2016-12-123-1/+14
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Adding support for personal snippet endpoint on the API Closes #22042 See merge request !6373