| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Cache highlighted diff lines for merge requests | Paco Guzman | 2016-08-03 | 1 | -3/+3 |
| | | | | | Introducing the concept of SafeDiffs which relates diffs with UI highlighting. | ||||
| * | State specific default sort order for issuables | zs | 2016-08-01 | 3 | -8/+91 |
| | | | | | | | | | | | | | | | | Provide more sensible default sort order for issues and merge requests based on the following table: | type | state | default sort order | |----------------|--------|--------------------| | issues | open | last created | | issues | closed | last updated | | issues | all | last created | | merge requests | open | last created | | merge requests | merged | last updated | | merge requests | closed | last updated | | merge requests | all | last created | | ||||
| * | Refactor service settings viewissue_8110 | Felipe Artur | 2016-07-20 | 1 | -5/+5 |
| | | |||||
| * | Add project service documentation and update integration documentation | Felipe Artur | 2016-07-19 | 1 | -0/+35 |
| | | |||||
| * | Merge branch 'master' into rename-repo-files | tiagonbotelho | 2016-07-19 | 1 | -1/+0 |
| |\ | |||||
| | * | Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffs | Paco Guzman | 2016-07-18 | 1 | -1/+0 |
| | | | |||||
| * | | Merge branch 'master' into rename-repo-files | tiagonbotelho | 2016-07-18 | 1 | -6/+4 |
| |\ \ | |/ | |||||
| | * | Merge branch '17341-firefox-u2f' into 'master' | Robert Speicher | 2016-07-15 | 1 | -6/+4 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow U2F devices to be used in Firefox - Adds U2F support for Firefox - Improve U2F feature detection logic - Have authentication flow be closer to the spec (single challenge instead of a challenge for each `signRequest`) - Closes #17341 - Related to #15337 See merge request !5177 | ||||
| | | * | Use a single challenge for U2F authentication. | Timothy Andrew | 2016-07-14 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. According to the spec, either we have a single challenge with a number of `signRequests`, or a number of `signRequests`, each with it's own challenge. 2. Previously, we had both these - per-request challenges, as well as a single extra challenge. 3. This commit changes this so that the per-request challenges are removed, leaving only a single challenge, as per the v1.1 U2F API. 4. The existing implementation didn't work in Firefox, because the Firefox (extension) implementation is less flexible with regard to the inputs. 5. Fix teaspoon specs. 6. References: https://fidoalliance.org/specs/fido-u2f-v1.0-nfc-bt-amendment-20150514/fido-u2f-javascript-api.html#h2_background | ||||
| | | * | Load Javascript U2F library selectively. | Timothy Andrew | 2016-07-14 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Only on supported Chrome versions 2. Mainly, this lets us simplify the javascript-based U2F check to `window.u2f`, where `window.u2f` can either be loaded from the GitLab server (for Chrome) or from the Firefox extension. 3. This is a better way to provide browser detection for U2F. | ||||
| * | | | refactors update action to change commit_params with the correct path | tiagonbotelho | 2016-07-12 | 1 | -1/+0 |
| | | | | |||||
| * | | | changes the usasge of path to file_path on blob_controller for ↵ | tiagonbotelho | 2016-07-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | compatibillity with the create action | ||||
| * | | | removes debugging prints from code | tiagonbotelho | 2016-07-12 | 1 | -8/+0 |
| | | | | |||||
| * | | | refactors blob_controller | tiagonbotelho | 2016-07-12 | 1 | -0/+8 |
| | | | | |||||
| * | | | removes debugging prints from code | tiagonbotelho | 2016-07-12 | 1 | -8/+0 |
| | | | | |||||
| * | | | refactors blob_controller | tiagonbotelho | 2016-07-12 | 1 | -0/+8 |
| | | | | |||||
| * | | | removes debugging prints from code | tiagonbotelho | 2016-07-12 | 1 | -8/+0 |
| | | | | |||||
| * | | | refactors blob_controller | tiagonbotelho | 2016-07-12 | 1 | -0/+8 |
| | | | | |||||
| * | | | removes debugging prints from code | tiagonbotelho | 2016-07-12 | 1 | -8/+0 |
| | | | | |||||
| * | | | refactors blob_controller | tiagonbotelho | 2016-07-12 | 1 | -0/+8 |
| | | | | |||||
| * | | | creates the update_file method in repository.rb and applies changes accordingly | tiagonbotelho | 2016-07-12 | 1 | -1/+2 |
| | | | | |||||
| * | | | successfully adds the new version with the updated name on the projects repo | tiagonbotelho | 2016-07-12 | 1 | -1/+2 |
| |/ / | |||||
| * | | Handle more than two paths in MergeRequest#diffs | Sean McGivern | 2016-07-11 | 1 | -1/+3 |
| | | | |||||
| * | | Make expand_all param more explicit | Sean McGivern | 2016-07-08 | 1 | -1/+1 |
| | | | |||||
| * | | DRY up diff_for_path actions | Sean McGivern | 2016-07-08 | 1 | -0/+23 |
| |/ | | | | | | 1. Move render method to a concern, not a helper. 2. Let DiffHelper#diff_options automatically add the path option. 3. Move more instance var definitions to before filters. | ||||
| * | Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scope | Rémy Coutable | 2016-07-01 | 1 | -2/+3 |
| | | | | | | | And create new Project#requesters, Group#requesters scopes. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Raise a new Gitlab::Access::AccessDeniedError when permission is not enough ↵ | Rémy Coutable | 2016-06-18 | 1 | -26/+8 |
| | | | | | | | | | to destroy a member This is a try for a new approach to put the access checks at the service level. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Redirect to the member's source on request withdrawal | Rémy Coutable | 2016-06-18 | 1 | -1/+2 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | New Members::DestroyService | Rémy Coutable | 2016-06-18 | 1 | -2/+4 |
| | | | | | | | | This is to ensure we don't send unwanted notifications when deleting a project. In other words, stop abusing AR callbacks and use services. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | UI and copywriting improvements13948-access-request-to-projects-and-groups | Rémy Coutable | 2016-06-14 | 2 | -38/+58 |
| | | | | | | | | | | + Move 'Edit Project/Group' out of membership-related partial + Show the access request buttons only to logged-in users + Put the request access buttons out of in a more visible button + Improve the copy in the #remove_member_message helper Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Factorize access request routes into a new :access_requestable route concern | Rémy Coutable | 2016-06-14 | 1 | -1/+1 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Factorize #request_access and #approve_access_request into a new ↵ | Rémy Coutable | 2016-06-14 | 1 | -0/+38 |
| | | | | | | | AccessRequestActions controller concern Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Merge branch 'notes-are-awardables' into 'master' | Douwe Maan | 2016-06-06 | 1 | -1/+10 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes are awardables ## What does this MR do? Makes sure we can :thunder_cloud_rain: comments/notes. ## What are the relevant issue numbers? Follows up upon !2901, depends on !3785 Closes #3655 ## Screenshots (if relevant) TODO See merge request !4291 | ||||
| | * | Backend awardables on comments | ZJ van de Weg | 2016-06-06 | 1 | -1/+10 |
| | | | |||||
| * | | Implement authentication (login) using a U2F device. | Timothy Andrew | 2016-06-06 | 1 | -1/+58 |
| |/ | | | | | | - Move the `authenticate_with_two_factor` method from `ApplicationController` to the `AuthenticatesWithTwoFactor` module, where it should be. | ||||
| * | Merge branch 'awardables' of gitlab.com:gitlab-org/gitlab-ce into awardables | Fatih Acet | 2016-05-18 | 1 | -0/+2 |
| |\ | |||||
| | * | Fix latests concerns | ZJ van de Weg | 2016-05-18 | 1 | -0/+2 |
| | | | |||||
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables | Fatih Acet | 2016-05-18 | 2 | -2/+2 |
| |\ \ | |/ |/| | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/models/note.rb # db/schema.rb # spec/models/note_spec.rb | ||||
| | * | Merge branch 'meinac/gitlab-ce-change_deprecated_render_usage' | Dmitriy Zaporozhets | 2016-05-18 | 1 | -1/+1 |
| | |\ | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | | * | Change deprecated usage of rendering without response body | Mehmet Emin İNAÇ | 2016-03-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | `render nothing: true` has been deprecated. For more information see [pr](https://github.com/rails/rails/pull/20336) | ||||
| | * | | Codestyle: make sure we have space around operators | Gabriel Mazetto | 2016-05-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into awardables | Zeger-Jan van de Weg | 2016-05-11 | 1 | -0/+2 |
| |\ \ \ | |/ / | |||||
| | * | | Use compact syntax | Alfredo Sumaran | 2016-04-21 | 1 | -4/+1 |
| | | | | |||||
| | * | | Allow filtering by Owned projects | Alfredo Sumaran | 2016-04-18 | 1 | -0/+5 |
| | | | | |||||
| * | | | Create table for award emoji | Zeger-Jan van de Weg | 2016-05-06 | 1 | -0/+20 |
| |/ / | |||||
| * | | Use respond_to instead of a conditional to paginate milestones | Rémy Coutable | 2016-03-23 | 1 | -4/+0 |
| | | | |||||
| * | | Fix an issue causing the Dashboard/Milestones page to be blank | Rémy Coutable | 2016-03-23 | 1 | -1/+4 |
| | | | |||||
| * | | Merge branch 'master' into 2489-soft-delete-issues | Zeger-Jan van de Weg | 2016-03-21 | 3 | -3/+3 |
| |\ \ | |||||
| | * | | Use the configured Kaminari "per page" defaultrs-use-kaminari-default | Robert Speicher | 2016-03-19 | 3 | -3/+3 |
| | |/ | |||||
| * | | Minor improvements on IssuableActions | Zeger-Jan van de Weg | 2016-03-21 | 2 | -21/+23 |
| | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |