summaryrefslogtreecommitdiff
path: root/features
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge remote-tracking branch 'dev/security-9-0' into 9-0-stable"Timothy Andrew2017-05-303-3/+3
| | | | | This reverts commit f6ba1e081c96bd0a8c3561d92f97aa11d6688bc5, reversing changes made to 810cc51be37e03ebbe99711a53663956e4ffde8c.
* Merge branch '28917-contain-uploads-in-system-dir' into 'security'Douwe Maan2017-05-263-3/+3
| | | | | | Upload files into `public/upload/system` instead of `public/upload` See merge request !2073
* MR shortcuts counter for stableSam Rose2017-04-071-3/+3
|
* Merge branch 'settings-tab' into 'master' Clement Ho2017-03-103-23/+27
| | | | | | | Removed the settings gear button inside the project view to a tab Closes #26733 See merge request !9786
* Merge branch 'master' into ↵26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pagesPhil Hughes2017-03-076-6/+69
|\ | | | | | | 26732-combine-deploy-keys-and-push-rules-and-mirror-repository-and-protect-branches-settings-pages
| * Merge branch '26371-native-emojis-v3' into 'master' Filipa Lacerda2017-03-071-1/+1
| |\ | | | | | | | | | | | | | | | | | | Add emoji images - Base Native Unicode Emojis Closes #26371 See merge request !9569
| | * Use native unicode emojisEric Eastwood2017-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - gl_emoji for falling back to image/css-sprite when the browser doesn't support an emoji - Markdown rendering (Banzai filter) - Autocomplete - Award emoji menu - Perceived perf - Immediate response because we now build client-side - Update `digests.json` generation in gemojione rake task to be more useful and include `unicodeVersion` MR: !9437 See issues - #26371 - #27250 - #22474
| * | Restore keyboard shortcuts for "Activity" and "Charts"Kushal Pandya2017-03-065-5/+68
| |/
* | Fixed tests, changed dispatcher routing to the 'repository:show'Jose Ivan Vargas2017-03-063-8/+10
|/ | | | | Also modified the render calls to the deploy_keys and protected_branches partials
* Merge branch 'dashboard-filter-search-keep-params' into 'master' Dmitriy Zaporozhets2017-03-042-3/+7
|\ | | | | | | | | | | | | Fixes filtering by name reseting archive filter Closes #28007 See merge request !9625
| * Improve explore projects spinach testDmitriy Zaporozhets2017-03-041-2/+6
| | | | | | | | | | | | | | | | Project name "Internal" is too generic and can lead to false positive/negative when there is a visibility filter on the page. So we ensure we check for project inside list holder css class. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Refactor projects filtering by nameDmitriy Zaporozhets2017-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reuse same search form and behavior for dashboard#projects, group#projects and admin#projects. Repsect all other options like sorting, personal filter when search projects by name. Create FilterableList JS class to handle identical behaviour of projects and groups lists. This change also makes filtering and sorting availabe on explore#projects and explore#groups no matter if you are logged in or not. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix cherry-picking or reverting through an MRDouwe Maan2017-03-021-0/+1
|/
* Cleaning up navigational order - ProjectKushal Pandya2017-03-028-34/+23
|
* Merge branch '25437-just-emoji' into 'master'Sean McGivern2017-03-012-1/+5
|\ | | | | | | | | | | | | #25437 Allow posting of just an emoji in comment; add /award slash command Closes #25437 See merge request !9382
| * add /award slash commandmhasbini2017-02-282-1/+5
| | | | | | | | add /award slash command; Allow posting of just an emoji in comment
* | Merge branch '27354-navigation-new-button' into 'master' Dmitriy Zaporozhets2017-02-281-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Put back the new project button Closes #27354 See merge request !9426
| * | Put back the new project button27354-navigation-new-buttonAnnabel Dunstone Gray2017-02-221-0/+1
| | |
* | | Merge branch '1937-https-clone-url-username' into 'master' Rémy Coutable2017-02-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add the username of the current user to the HTTP(S) clone URL Closes #1937 See merge request !9347
| * | | Add the username of the current user to the HTTP(S) clone URLJan Christophersen2017-02-241-1/+1
| | |/ | |/|
* | | Merge branch 'remove-jquery-ui-plugins' into 'master' Jacob Schatz2017-02-242-19/+13
|\ \ \ | |/ / |/| | | | | | | | Removed jQuery UI highlight & autocomplete See merge request !8420
| * | Removed jQuery UI highlight & autocompleteremove-jquery-ui-pluginsPhil Hughes2017-02-092-19/+13
| | | | | | | | | | | | In an effort to tackle #18437 this removes 2 of the jQuery UI plugins. Highlight & autocomplete, both used once in our code. Highlight was just removed easily, autocomplete was replaced with GL dropdown
* | | Revert "Enable Style/BarePercentLiterals"Douwe Maan2017-02-231-1/+1
| | | | | | | | | | | | This reverts commit 96bef54154e669f9a3e92c3a4bc76c0be3a52e48.
* | | Enable Style/WordArrayDouwe Maan2017-02-231-1/+1
| | |
* | | Enable Style/BarePercentLiteralsDouwe Maan2017-02-231-1/+1
| | |
* | | Enable Performance/RedundantMergeDouwe Maan2017-02-231-1/+1
| | |
* | | Code style improvementsAlfredo Sumaran2017-02-231-3/+1
| |/ |/|
* | Add filtered search to MR pageadd-filtered-search-to-mrClement Ho2017-02-211-7/+0
| |
* | Fix Spinach failurefix-spinach-failureDouwe Maan2017-02-201-0/+1
| |
* | Merge branch '25465-todo-done-clicking-is-kind-of-unsafe' into 'master' Clement Ho2017-02-181-9/+14
|\ \ | | | | | | | | | | | | | | | | | | Todo done clicking is kind of unusable. Closes #25465 See merge request !8691
| * | Todo done clicking is kind of unusable.Jacopo2017-02-171-9/+14
| | | | | | | | | | | | | | | | | | The Done button will change to an Undo button and the line item will be greyed out. Bold links will be unbolded. The user can undo the task by clicking the Undo button.
* | | Merge branch 'fix/gb/pipeline-retry-builds-started' into 'master' Kamil Trzciński2017-02-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make pipeline retry take stages order into account Closes #27431, #23710, and #26551 See merge request !9021
| * \ \ Merge branch 'master' into fix/gb/pipeline-retry-builds-startedGrzegorz Bizon2017-02-172-47/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (313 commits) Allow slashes in slash command arguments Add API endpoint to get all milestone merge requests remove trailing comma Restore pagination to admin abuse reports replace deprecated NoErrorsPlugin with NoEmitOnErrorsPlugin only compress assets in production Reduce number of pipelines created to test pagination add CHANGELOG.md entry for !8761 prevent diff unfolding link from appearing for deleted files fix build failures only show diff unfolding link if there are more lines to show fix typo in node section Only yield valid references in ReferenceFilter.references_in Cache js selectors; fix css move "Install node modules" step before "Migrate DB" within update process Renders pagination again for pipelines table update migration docs for 8.17 to include minimum node version Add CHANGELOG file Fix positioning of top scroll button Remove comments in migration ...
| * | | | Make build clone/retry implementation more robustfix/gb/pipeline-retry-builds-startedGrzegorz Bizon2017-02-161-1/+1
| | |/ / | |/| |
* | | | Merge branch 'move-spinach-dashboard-issues-test-to-rspec' into 'master'Rémy Coutable2017-02-172-112/+0
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Move dashboard issues spinach test to Rspec See merge request !8955
| * | | Move dashboard issues spinach test to RspecSemyon Pupkov2017-02-102-112/+0
| |/ / | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | Delete labels spinach test bc covered by rspecAnnabel Dunstone Gray2017-02-152-47/+0
|/ /
* | Merge branch 'move-user-snippets-spinach-test-to-rspec' into 'master'Rémy Coutable2017-02-092-89/+0
|\ \ | |/ |/| | | | | Move 'User Snippets' Spinach feature to Rspec See merge request !8574
| * Move 'User Snippets' Spinach feature to Rspecthe-undefined2017-01-162-89/+0
| | | | | | | | | | | | | | | | This commit moves the `snippets/user.feature` Spinach test to a Rspec feature, as part of deprecating the Spinach test suite. - Remove Spinach discover snippets feature and steps - Add Rspec feature test
* | Merge branch 'master' into 'jej-pages-to-ce'jej-pages-to-ceJames Edwards-Jones2017-02-061-0/+3
|\ \ | | | | | | | | | # Conflicts: # db/schema.rb
| * \ Merge branch '25624-anticipate-obstacles-to-removing-turbolinks' into 'master' Jacob Schatz2017-02-031-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove Turbolinks Closes #25624 See merge request !8570
| | * | Find .merge-request instead of sleep in MR search spec.25624-anticipate-obstacles-to-removing-turbolinksBryce Johnson2017-02-021-1/+3
| | | |
| | * | Remove turbolinks.Bryce Johnson2017-02-021-0/+1
| | | |
* | | | Merge branch 'master' into jej-pages-picked-from-eeJames Edwards-Jones2017-02-035-34/+6
|\ \ \ \ | |/ / /
| * | | Fix broken tests17662-rename-buildsFilipa Lacerda2017-02-033-6/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename Build to Job Replace "Builds" by "Jobs" and fix broken specs Replace "Builds" by "Jobs" Fix broken spinach test Fix broken test Remove `˙` at the beginning of the file Fix broken spinach test Fix broken tests Changes after review
| * | Move Dashboard shortcuts specs from Spinah to RSpecmove-dashboard-shortcuts-from-spinach-to-rspecRémy Coutable2017-01-312-28/+0
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Project#ensure_pipeline changed the args orderLin Jen-Shin2017-01-311-1/+1
| | |
* | | Fix EE specs after ci_commit rename to pipelineKamil Trzcinski2017-01-311-6/+6
| | |
* | | Fix adding pages domain to projects in groupsKamil Trzcinski2017-01-312-0/+15
| | |
* | | Fix broken feature testsKamil Trzcinski2017-01-311-1/+1
| | |
View Lorry Controller Status