summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Allow API scope declarations to be applied conditionally.Timothy Andrew2017-06-281-6/+9
| | | | | | | | | | | - Scope declarations of the form: allow_access_with_scope :read_user, if: -> (request) { request.get? } will only apply for `GET` requests - Add a negative test to a `POST` endpoint in the `users` API to test this. Also test for this case in the `AccessTokenValidationService` unit tests.
* Initial attempt at refactoring API scope declarations.Timothy Andrew2017-06-281-1/+4
| | | | | | | | | | - Declaring an endpoint's scopes in a `before` block has proved to be unreliable. For example, if we're accessing the `API::Users` endpoint - code in a `before` block in `API::API` wouldn't be able to see the scopes set in `API::Users` since the `API::API` `before` block runs first. - This commit moves these declarations to the class level, since they don't need to change once set.
* Merge branch 'refactor-emoji-utils' into 'master'Tim Zallmann2017-06-289-170/+137
|\ | | | | | | | | Refactor emoji helpers in preparation for async loading See merge request !12432
| * revert removal of requestAnimationFrame and move to a separate MR/discussionrefactor-emoji-utilsMike Greiling2017-06-271-2/+8
| |
| * rename getEmojiCategoryMap and remove unnecessary parameterMike Greiling2017-06-272-9/+9
| |
| * move glEmojiTag method to emoji helperMike Greiling2017-06-275-86/+67
| |
| * split emoji support methods from the async moduleMike Greiling2017-06-275-10/+14
| |
| * export validEmojiNames for autocompleteMike Greiling2017-06-262-2/+3
| |
| * replace emojiAlias references with normalizeEmojiName helperMike Greiling2017-06-261-5/+3
| |
| * namespace emoji helper methods within AwardsHandler classMike Greiling2017-06-261-13/+8
| |
| * move emoji category index to helper methodMike Greiling2017-06-262-27/+32
| |
| * move emojiAlias logic into helper moduleMike Greiling2017-06-262-16/+17
| |
| * fix method definition stylingMike Greiling2017-06-261-12/+2
| |
| * move normalizeEmojiName method to emoji helper moduleMike Greiling2017-06-263-20/+14
| |
| * remove problematic use of requestAnimationFrameMike Greiling2017-06-261-8/+2
| |
| * centralize emoji helper methodsMike Greiling2017-06-237-21/+22
| |
| * refactor option defaultsMike Greiling2017-06-231-5/+2
| |
* | Ignore JSON files generated from PO filesRuben Davila2017-06-279-9/+0
| |
* | Merge branch '34276-fix-dashboard-page-when-last-activity-at-is-nil' into ↵Robert Speicher2017-06-272-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix application error when Project#last_activity_at is nil Closes #34276 See merge request !12443
| * | Fix application error when Project#last_activity_at is nil34276-fix-dashboard-page-when-last-activity-at-is-nilRuben Davila2017-06-262-2/+2
| | |
* | | Slightly refactor pipeline schedules form in preparation for additionsBryce Johnson2017-06-273-155/+172
| | |
* | | Merge branch 'dm-commit-row-browse-button' into 'master'Robert Speicher2017-06-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adjust commit partial cache key to fix browse buttons Closes #26899 See merge request !12393
| * | | Adjust commit partial cache key to fix browse buttonsDouwe Maan2017-06-221-1/+1
| | | |
* | | | Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter ↵Luke "Jared" Bennett2017-06-271-1/+1
| | | | | | | | | | | | | | | | submits twice and refreshes page"
* | | | Merge branch 'gitlab-git-find-commits' into 'master'Sean McGivern2017-06-271-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Clean up Gitlab::Git::Commit.find_all See merge request !12476
| * | | | Remove Gitlab::Git::Repository#find_allJacob Vosmaer2017-06-271-1/+1
| | | | |
* | | | | Resolve "Unable to access edit comment from dropdown menu in certain screen ↵Luke "Jared" Bennett2017-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | sizes"
* | | | | Merge branch ↵Douwe Maan2017-06-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33442_supplement_traditional_chinese_in_hong_kong_translation_of_i18n' into 'master' Supplement Traditional Chinese in Hong Kong translation of Project Page & Repository Page Closes #33442 See merge request !11995
| * | | | | Change 'Committed by' Translate黄涛2017-06-201-1/+1
| | | | | |
| * | | | | Translation optimization黄涛2017-06-201-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Modify the identified translations in the discussion. 2. rebase to master
| | * | | | | add missing translation fields黄涛2017-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Follow up !12052 commits.
| | * | | | | translation optimization in synchronous reviews黄涛2017-06-151-1/+1
| | | | | | |
| | * | | | | translation optimization in synchronous reviews黄涛2017-06-141-1/+1
| | | | | | |
| | * | | | | Optimization 'zh_HK' translation黄涛2017-06-131-1/+1
| | | | | | |
| | * | | | | Optimization 'zh_HK' translation黄涛2017-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix missing translations
| | * | | | | optimize translation based on comments黄涛2017-06-131-1/+1
| | | | | | |
| | * | | | | supplement traditional chinese in hong kong translation黄涛2017-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #33442
| * | | | | | supplement traditional chinese in hong kong translation黄涛2017-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #33442
* | | | | | | Merge branch '33561_supplement_bulgarian_translation_of_i18n' into 'master'Douwe Maan2017-06-271-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Supplement Bulgarian translation of Project Page & Repository Page Closes #33561 See merge request !12083
| * | | | | | | supplement bulgarian translation黄涛2017-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #33561
* | | | | | | | Merge branch 'issue-form-multiple-line-markdown' into 'master'Filipa Lacerda2017-06-271-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed multi-line markdown in issue edit form Closes #34318 See merge request !12458
| * | | | | | | | Fixed multi-line markdown in issue edit formissue-form-multiple-line-markdownPhil Hughes2017-06-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #34318
* | | | | | | | | Merge branch 'zj-review-apps-usage-data' into 'master'Grzegorz Bizon2017-06-271-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add review apps to usage ping Closes #33171 See merge request !12185
| * | | | | | | | | Add in_review_folder to usage pingzj-review-apps-usage-dataZ.J. van de Weg2017-06-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As its hard to reliably check how many review apps there are on the clients machine, we start by checking where the type is `review`. This means the folder is called that way. This will lead to a seq scan on the table. However, this is done once a week, so the benefit of adding an index seems not to apply here.
* | | | | | | | | | Action Buttons on Prio Labels working again by setting pointer events to ↵Tim Zallmann2017-06-274-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | none on…
* | | | | | | | | | Merge branch 'pat-alert-when-signin-disabled' into 'master'Rémy Coutable2017-06-275-9/+38
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide hint to create a personal access token for Git over HTTP See merge request !12105
| * | | | | | | | | | Provide hint to create a personal access token for Git over HTTPRobin Bobbitt2017-06-265-9/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If internal auth is disabled and user is not an LDAP user, present the user with an alert to create a personal access token if he does not have one already.
* | | | | | | | | | | Merge branch 'fix-33991' into 'master'Sean McGivern2017-06-272-23/+31
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to subscribe to group labels on the group labels page Closes #33991 See merge request !12402
| * | | | | | | | | | Fix missing hidden class when subscribed to a group labelfix-33991Douglas Barbosa Alexandre2017-06-261-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Fix LabelsHelper#toggle_subscription_label_pathDouglas Barbosa Alexandre2017-06-261-4/+6
| | | | | | | | | | |
View Lorry Controller Status