summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* API: Ability to get group's project in simple representationapi-simple-group-projectRobert Schilling2016-12-134-9/+32
|
* Merge branch 'fix-autoloading-issue' into 'master' Sean McGivern2016-12-131-1/+0
|\ | | | | | | | | | | | | Don't require `API::API` in routes Closes #18312. See merge request !8045
| * Don't require `API::API` in routesfix-autoloading-issueRémy Coutable2016-12-121-1/+0
| | | | | | | | | | | | | | | | | | | | `API::API` is autoloaded and shouldn't be required in non-autoloaded code. Otherwise, we get the following dreaded error: A copy of API::Helpers has been removed from the module tree but is still active! Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'awards_handler-fixture' into 'master' Alfredo Sumaran2016-12-133-57/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace static fixture for awards_handler_spec ## What does this MR do? Use the already existing dynamic fixture `issues/open-issue.html` (!6059) in `awards_handler_spec.js` instead of the static fixture `awards_handler.html.haml`. ## What are the relevant issue numbers? #24753 See merge request !7661
| * | Replace static fixture for awards_handler_spec (!7661)winniehell2016-12-123-57/+9
| | |
* | | Merge branch 'patch-8' into 'master' Stan Hu2016-12-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Crontab typo for PruneOldEventsWorker to run 4x/day instead of 60x/hour In c0a92cb8 the intended cron setting (per the comment) was to be "4 times a day", a * instead of a 0 means it runs 60x/hr 4x/day. Closes #25571 See merge request !8051
| * | | Crontab typo '* */6' -> '0 */6' (4x/day not 1x-per-min-for-1h 4x/day)Jon Bailey2016-12-121-1/+1
| |/ /
* | | Merge branch 'fix-eslint-warnings' into 'master' Alfredo Sumaran2016-12-132-8/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed lint warning and propose fail or warning ## What does this MR do? 1. Fixes a linter warning that is currently on `master`. 2. Proposes the use of `--max-warnings 0` with `eslint` to make sure the CI build fails on any warnings. ## 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? See merge request !8025
| * | | Fixed lint warning and propose fail or warningfix-eslint-warningsLuke "Jared" Bennett2016-12-102-8/+10
| | | |
* | | | 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-122-19/+69
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-082-19/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-122-4/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | add CHANGELOG entry for !802119550-fix-contributer-graph-duplicatesMike Greiling2016-12-101-0/+4
| | | | | |
| * | | | | 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-123-5/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 changelogNur Rony2016-12-121-0/+4
| | | | | |
| * | | | | 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-1218-122/+187
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | |
| * | | | | | add new tests for snippets_finder.rbMike Greiling2016-12-101-1/+24
| | | | | | |
| * | | | | | 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-103-4/+4
| | | | | | |
| * | | | | | 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-1210-84/+709
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify the service API Related to #22928 See merge request !7970
| * | | | | | Grapify the service APIgrapify-service-apiRobert Schilling2016-12-122-7/+17
| | | | | | |
| * | | | | | Grapify the service APIRobert Schilling2016-12-0911-85/+700
| | | | | | |
* | | | | | | 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 'cs-update-sidekiq-427' into 'master' Rémy Coutable2016-12-122-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Sidekiq from 4.2.1 to 4.2.7. Includes various bug fixes, mostly for Rails 5. Changelog: https://github.com/mperham/sidekiq/blob/fc168fe393bee3ad1fcbb52cff2d84af86c38cc4/Changes.md See merge request !8032
| * | | | | | Update Sidekiq from 4.2.1 to 4.2.7.cs-update-sidekiq-427Connor Shea2016-12-112-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes various bug fixes, mostly for Rails 5. Changelog: https://github.com/mperham/sidekiq/blob/fc168fe393bee3ad1fcbb52cff2d84af86c38cc4/Changes.md