summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Add tooltips for common Event feed entriesrs-event-common-has-tooltipRobert Speicher2016-05-301-1/+1
| | | | | This adds tooltips to the event target for events like "opened merge request !XYZ"
* Merge branch 'rubocop/enable-space-before-comma-cop' into 'master' Robert Speicher2016-05-301-3/+10
|\ | | | | | | | | | | | | | | | | Enable Style/SpaceBeforeComma rubocop cop No spaces before commas. See #17478 See merge request !4360
| * Enable Style/SpaceBeforeComma rubocop coprubocop/enable-space-before-comma-copGrzegorz Bizon2016-05-301-3/+10
| | | | | | | | | | | | No spaces before commas. See #17478
* | Merge branch 'rubocop/enable-negatedif-style-cop' into 'master' Robert Speicher2016-05-303-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/NegatedIf Rubocop cop Favor `unless` over `if` for negative conditions (or control flow ||). ```ruby # bad do_something if !some_condition # bad do_something if not some_condition # good do_something unless some_condition # good some_condition || do_something ``` See #17478 See merge request !4355
| * | Enable Style/NegatedIf Rubocop coprubocop/enable-negatedif-style-copGrzegorz Bizon2016-05-303-3/+3
| |/ | | | | | | | | | | | | Favor `unless` over `if` for negative conditions (or control flow ||). See #17478
* | Merge branch 'rubocop/enable-literal-in-condition-cop' into 'master' Robert Speicher2016-05-302-8/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable Lint/LiteralInCondition rubocop cop Detects literals used in conditions. See #17478 See merge request !4354
| * | Enable Lint/LiteralInCondition rubocop coprubocop/enable-literal-in-condition-copGrzegorz Bizon2016-05-302-8/+7
| |/ | | | | | | | | | | Checks of literals used in conditions. See #17478
* | Merge branch 'style/enable-multiline-if-then-rubocop-cop' into 'master' Robert Speicher2016-05-301-5/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/MultilineIfThen rubocop cop Do not use then for multi-line if. See #7478. See merge request !4353
| * | Enable Style/MultilineIfThen rubocop copstyle/enable-multiline-if-then-rubocop-copGrzegorz Bizon2016-05-301-5/+5
| |/ | | | | | | | | | | Do not use then for multi-line if. See #7478.
* | Merge branch 'style/enable-method-def-parentheses-rubocop-cop' into 'master' Robert Speicher2016-05-303-4/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/MethodDefParentheses rubocop cop Use def with parentheses when there are parameters. See #17478 See merge request !4352
| * | Enable Style/MethodDefParentheses rubocop copstyle/enable-method-def-parentheses-rubocop-copGrzegorz Bizon2016-05-303-4/+4
| |/ | | | | | | | | | | Use def with parentheses when there are parameters. See #17478
* | Merge branch 'style/enable-while-until-do-rubocop-style-cop' into 'master' Robert Speicher2016-05-301-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/WhileUntilDo rubocop style cop Checks for redundant `do` after `while` or `until`. See #17478 See merge request !4350
| * | Enable Style/WhileUntilDo rubocop style copstyle/enable-while-until-do-rubocop-style-copGrzegorz Bizon2016-05-301-1/+1
| |/ | | | | | | See #17478
* | Merge branch 'style/enable-rubocop-end-of-line-cop' into 'master' Robert Speicher2016-05-301-26/+26
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/EndOfLine Rubocop style cop Use Unix-style line endings. Removed carriage return character from end of each line in `app/controllers/projects/find_file_controller.rb` See #17478 See merge request !4347
| * | Enable Style/EndOfLine Rubocop style copstyle/enable-rubocop-end-of-line-copGrzegorz Bizon2016-05-301-26/+26
| |/ | | | | | | Use Unix-style line endings. See #17478.
* | Merge branch 'style/enable-block-alignment-rubocop-lint' into 'master' Robert Speicher2016-05-301-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Enable Lint/BlockAlignment Rubocop cop See #17478 See merge request !4346
| * | Enable Lint/BlockAlignment Rubocop copstyle/enable-block-alignment-rubocop-lintGrzegorz Bizon2016-05-301-2/+2
| |/ | | | | | | See #17478
* | Enable Style/RedundantParentheses rubocop coprubocop/enable-redundant-parentheses-copGrzegorz Bizon2016-05-301-2/+2
|/ | | | See #17478
* Validate presence of noteable_type in note modelGrzegorz Bizon2016-05-291-0/+1
|
* Do not override foreign attributes in note factoryGrzegorz Bizon2016-05-291-1/+1
|
* Remove redundant `with_options` from note validatorsGrzegorz Bizon2016-05-291-5/+3
|
* Improve note validation for project mismatchGrzegorz Bizon2016-05-291-5/+7
|
* Make note invalid if noteable project is differentGrzegorz Bizon2016-05-291-0/+6
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15577
* Remove reduntant note validation from create serviceGrzegorz Bizon2016-05-291-11/+0
|
* Use $ as the snippet prefix so it's consistentLin Jen-Shin2016-05-281-1/+1
|
* Project#show on projects pending deletion will 404zj-race-condition-pending-deleteZeger-Jan van de Weg2016-05-281-1/+1
| | | | fixes #17508
* Merge branch 'bendyorke-comment-fix' into 'master' Jacob Schatz2016-05-271-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update notes immediately after closing/reopening ## What does this MR do? Fixes MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4127 Thanks @bendyorke! ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? Constant conflicts in that MR ## What are the relevant issue numbers? ## Screenshots (if relevant) Fixes #15091 See merge request !4323
| * Update notes immediately after closing/reopeningBen Yorke2016-05-271-4/+4
| |
* | Fixed issue with calendar activity button not sending request correctlyPhil Hughes2016-05-271-1/+1
|/
* Merge branch 'issuable-header-by-spacing' into 'master' Jacob Schatz2016-05-271-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with spacing in issuable header ## What does this MR do? Fixes an issue with spacing next to the word 'by' in the issuable header ## What are the relevant issue numbers? Closes #17864 ## Screenshots (if relevant) ![Screen_Shot_2016-05-27_at_11.53.37](/uploads/464c2149df304109726b7d7ab855ebe1/Screen_Shot_2016-05-27_at_11.53.37.png) See merge request !4314
| * Fixed issue with spacing in issuable headerissuable-header-by-spacingPhil Hughes2016-05-271-1/+1
| | | | | | | | | | | | The Ruby was returning the HTML without a spacing next to the word 'by' Closes #17864
* | Merge branch 'fix-multiple-ci-status-poll' into 'master' Jacob Schatz2016-05-272-2/+16
|\ \ | |/ |/| | | | | | | | | | | | | Fixed potential issue with 2 ci status polling events happening Possible cause for double notifications was if the request was slow & then you changed page whilst this request was happening it would finish on another page & then launch another interval - this stops that issue. Also passed in the CI status as an option value rather than waiting for the first ajax request to finish See merge request !3869
| * Fixed potential issue with 2 ci status polling events happeningfix-multiple-ci-status-pollPhil Hughes2016-05-262-2/+16
| |
* | Merge branch 'filter-by-any-user' into 'master' Jacob Schatz2016-05-263-12/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Filter issuables by any user ![any-user](/uploads/c9626b9ac355747344a7073f61dc0c82/any-user.gif) Closes #2836 See merge request !3820
| * | Fixed user select failing tests on merge requestfilter-by-any-userPhil Hughes2016-05-261-1/+1
| | |
| * | Filter issuables by any userPhil Hughes2016-05-263-12/+10
| | | | | | | | | | | | Closes #2836
* | | Merge branch 'scroll-links-bug' into 'master' Jacob Schatz2016-05-261-0/+21
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where fade div covers up controls button ## What does this MR do? Fixes bug where fade div covers up controls button ## Screenshots (if relevant) Before: <img src="/uploads/a6a883839255b8e10d872759a1aa54a0/Screen_Shot_2016-05-26_at_2.22.08_PM.png" width="300px"> After: <img src="/uploads/9ab53d9815470cf86f68f5a340ffc454/Screen_Shot_2016-05-26_at_2.22.42_PM.png" width="300px"> See merge request !4306
| * | | Fix bug where fade div covers up controls buttonscroll-links-bugAnnabel Dunstone2016-05-261-0/+21
| | | |
* | | | Merge branch 'remove-unnecessary-titles' into 'master' Robert Speicher2016-05-2673-78/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Remove header title from project pages With new navigation design it makes no sense to duplicate title in the header. See merge request !4304
| * | | Return header title for new project pageremove-unnecessary-titlesDmitriy Zaporozhets2016-05-261-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Remove header title from project pagesDmitriy Zaporozhets2016-05-2673-78/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | With new navigation design it makes no sense to duplicate title in the header Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'commit-header-buttons' into 'master' Jacob Schatz2016-05-264-38/+63
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduced number of buttons in commit header ## What does this MR do? Reduces the buttons in the commit header. ## What are the relevant issue numbers? Closes #17576 ## Screenshots ![Screen_Shot_2016-05-26_at_11.22.24](/uploads/b0d8535bbc02ae367f193dd6633bd022/Screen_Shot_2016-05-26_at_11.22.24.png) See merge request !4302
| * | | | Improved mobile stylingcommit-header-buttonsPhil Hughes2016-05-262-14/+37
| | | | |
| * | | | Reduced number of buttons in commit headerPhil Hughes2016-05-264-26/+28
| | |/ / | |/| | | | | | | | | | Closes #17576
* | | | Merge branch 'move-project-dropdown-async' into 'master' Jacob Schatz2016-05-263-3/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loads move issue dropdown async To keep the style of the dropdown the same as the other dropdowns in the issue form, it uses select2 rather than our new dropdowns. ![dropdown](/uploads/e80d5f48440b2a49fd3ac13e74c1ba55/dropdown.gif) Closes #16563 See merge request !4160
| * | | | Updated Rubymove-project-dropdown-asyncPhil Hughes2016-05-251-2/+5
| | | | |
| * | | | Correctly sends project IDPhil Hughes2016-05-202-2/+2
| | | | |
| * | | | Loads move issue dropdown asyncPhil Hughes2016-05-163-3/+33
| | | | | | | | | | | | | | | | | | | | Closes #16563
* | | | | Merge branch 'services-ui' into 'master' Jacob Schatz2016-05-262-39/+45
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Updated services UI ![Screen_Shot_2016-05-17_at_10.38.10](/uploads/791ba27b3bbc18c9bde19ecf58ffea21/Screen_Shot_2016-05-17_at_10.38.10.png) See merge request !4177
| * | | | Hide description on mobileservices-uiPhil Hughes2016-05-261-25/+24
| | | | |