| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'add-sentry-js-again-with-vue' into 'master' | Phil Hughes | 2017-05-05 | 1 | -0/+5 |
| |\ | | | | | | | | | Add sentry JS See merge request !6764 | ||||
| | * | Merge branch 'master' into 'add-sentry-js-again-with-vue' | Luke "Jared" Bennett | 2017-05-04 | 2 | -2/+2 |
| | |\ | | | | | | | | | | # Conflicts: # db/schema.rb | ||||
| | * | | Removed clientside_sentry ref in settings.rb | Luke "Jared" Bennett | 2017-05-04 | 1 | -1/+1 |
| | | | | |||||
| | * | | Review changes, removed api/v3 updates as its frozen, removed the ↵ | Luke "Jared" Bennett | 2017-05-04 | 1 | -4/+0 |
| | | | | | | | | | | | | | clientside_sentry properties from the sensitive data filter as they\'re both available publically | ||||
| | * | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-05-04 | 3 | -9/+23 |
| | |\ \ | |||||
| | * \ \ | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-05-03 | 2 | -0/+4 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue | Luke "Jared" Bennett | 2017-04-28 | 4 | -13/+31 |
| | |\ \ \ \ | |||||
| | * | | | | | Attempted adding separate clientside_sentry settings | Luke "Jared" Bennett | 2017-04-28 | 2 | -1/+10 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-page | Ruben Davila | 2017-05-04 | 4 | -11/+25 |
| |\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/gitlab/cycle_analytics/review_stage.rb lib/gitlab/cycle_analytics/staging_stage.rb lib/gitlab/cycle_analytics/test_stage.rb | ||||
| | * | | | | | Merge branch '12910-uploader-pers-snippet' into 'master' | Sean McGivern | 2017-05-04 | 2 | -2/+2 |
| | |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | Prepare uploaders for personal snippets comments See merge request !11022 | ||||
| | | * | | | | Support uploaders for personal snippets comments12910-uploader-pers-snippet | Jarka Kadlecova | 2017-05-02 | 2 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | Merge branch '31544-size-of-project-from-api' into 'master' | Rémy Coutable | 2017-05-04 | 1 | -5/+9 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Size of project from API" Closes #31544 See merge request !11013 | ||||
| | | * | | | | | Expose project statistics on single requests via the API | Mark Fletcher | 2017-05-03 | 1 | -5/+9 |
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + The statistics parameter was already accepted * This commit ensure that it is respected for GET /projects/:id endpoint + Add documentation of the parameter and update the example response for stats | ||||
| | * | | | | | Improve documentation | Shinya Maeda | 2017-05-03 | 1 | -5/+5 |
| | | | | | | | |||||
| | * | | | | | Add constant as ALLOWED_INDEXED_COLUMNS | Shinya Maeda | 2017-05-03 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Use HasStatus::AVAILABLE_STATUSES instead of hard coding | Shinya Maeda | 2017-05-03 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Revert "Use JSON type for sorting parameter (halfway)" | Shinya Maeda | 2017-05-03 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 34127cb13ad72f65a24bdc8fc051363d3edd77cb. | ||||
| | * | | | | | Use JSON type for sorting parameter (halfway) | Shinya Maeda | 2017-05-03 | 1 | -4/+4 |
| | | | | | | | |||||
| | * | | | | | No need to support sha for sorting | Shinya Maeda | 2017-05-03 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Reduce playable columns for sorting | Shinya Maeda | 2017-05-03 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Add name(User) | Shinya Maeda | 2017-05-03 | 1 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | Fix how to use PipelinesFinder | Shinya Maeda | 2017-05-03 | 2 | -2/+2 |
| | | | | | | | |||||
| | * | | | | | %[] to %w[] | Shinya Maeda | 2017-05-03 | 1 | -4/+4 |
| | | | | | | | |||||
| | * | | | | | %w() to %[] | Shinya Maeda | 2017-05-03 | 1 | -5/+5 |
| | | | | | | | |||||
| | * | | | | | Fix rubocop offences and rspec failures | Shinya Maeda | 2017-05-03 | 1 | -3/+3 |
| | | | | | | | |||||
| | * | | | | | Add specs. Plus, minor fixes. | Shinya Maeda | 2017-05-03 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Fixed those points. | Shinya Maeda | 2017-05-03 | 1 | -9/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - username to user_id - Drop duration - Resolve comments - Add Changelog - Edit docs | ||||
| | * | | | | | - Add new parameters for Pipeline API | Shinya Maeda | 2017-05-03 | 1 | -1/+11 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | - Expand PipelinesFinder functions | ||||
| * | | | | | More updates for translations plus some refactoring. | Ruben Davila | 2017-05-03 | 1 | -0/+3 |
| |/ / / / | |||||
| * | | | | Merge branch '26488-target-disabled-mr' into 'master' | Sean McGivern | 2017-05-02 | 2 | -0/+4 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Fix 404 when upstream disabled merge requests Closes #26488 See merge request !10427 | ||||
| | * | | | Fix 404 when upstream has disabled merge requests | mhasbini | 2017-04-27 | 2 | -0/+4 |
| | | | | | |||||
| * | | | | Revert "Merge branch 'tc-no-todo-service-select' into 'master'"revert-c3c465ac | Stan Hu | 2017-04-29 | 2 | -4/+4 |
| | | | | | | | | | | | | | This reverts merge request !10845 | ||||
| * | | | | Merge branch 'tc-no-todo-service-select' into 'master' | Robert Speicher | 2017-04-28 | 2 | -4/+4 |
| |\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | Avoid plucking Todo ids in TodoService Closes #30374 See merge request !10845 | ||||
| | * | | | Avoid plucking Todo ids and use sub-queries insteadtc-no-todo-service-select | Toon Claes | 2017-04-27 | 2 | -4/+4 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | TodoService should not call `.select(&:id)` on todos, because this is bad performance. So instead use sub-queries, which will result in a single SQL query to the database. https://docs.gitlab.com/ee/development/sql.html#plucking-ids | ||||
| * | | | Merge branch '29505-allow-admins-sudo-to-blocked-users' into 'master' | Rémy Coutable | 2017-04-27 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | Allow admins to sudo to blocked users See merge request !10842 | ||||
| | * | | | Allow admins to sudo to blocked users.29505-allow-admins-sudo-to-blocked-users | Timothy Andrew | 2017-04-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Currently, (for example) admins can't delete snippets for blocked users, which is an unexpected limitation. - We modify `authenticate!` to conduct the `access_api` policy check against the `initial_current_user`, instead of the user being impersonated. - Update CHANGELOG for !10842 | ||||
| * | | | | Wrong method call on notify_post_receive. | Luigi Leoni | 2017-04-27 | 1 | -1/+1 |
| | |/ / |/| | | |||||
| * | | | Merge branch '26437-closed-by' into 'master' | Rémy Coutable | 2017-04-26 | 1 | -0/+15 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add issues/:iid/closed_by api endpoint Closes #26437 See merge request !10511 | ||||
| | * | | | Add issues/:iid/closed_by api endpoint | mhasbini | 2017-04-12 | 1 | -0/+15 |
| | | | | | |||||
| * | | | | Ability to filter merge requests by labels and milestones | Robert Schilling | 2017-04-25 | 1 | -11/+14 |
| | |_|/ |/| | | |||||
| * | | | Merge branch '29903-remove-user-is-admin-flag-from-api' into 'master' | Sean McGivern | 2017-04-25 | 3 | -5/+5 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Don't display the `is_admin?` flag for user API responses Closes #29903 See merge request !10846 | ||||
| | * | | | Don't display the `is_admin?` flag for user API responses. | Timothy Andrew | 2017-04-25 | 3 | -5/+5 |
| | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - To prevent an attacker from enumerating the `/users` API to get a list of all the admins. - Display the `is_admin?` flag wherever we display the `private_token` - at the moment, there are two instances: - When an admin uses `sudo` to view the `/user` endpoint - When logging in using the `/session` endpoint | ||||
| * | | | Fix updating merge_when_build_succeeds via merge API endpointmrchrisw-22740-merge-api | Chris Wilson | 2017-04-24 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When updating a merge request via the `/merge` endpoint we check the `mergeable` and `mergeable_state` status, these will return `false` if the application option only_allow_merge_if_pipeline_succeeds is enabled. We should skip CI checks if the request uses the merge_when_pipeline_succeeds param Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22740 | ||||
| * | | | Merge branch 'fix-jobs-enabled-parameter' into 'master' | Sean McGivern | 2017-04-21 | 1 | -2/+5 |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | Replace builds_enabled with jobs_enabled in projects API v4 Closes #31012 See merge request !10786 | ||||
| | * | | Replace builds_enabled with jobs_enabled in projects API v4 (!10786) | winniehell | 2017-04-20 | 1 | -2/+5 |
| | | | | |||||
| * | | | Refactor changing files in web UI | Douwe Maan | 2017-04-20 | 4 | -8/+8 |
| | | | | |||||
| * | | | Merge branch 'query-users-by-extern-uid' into 'master' | Robert Speicher | 2017-04-19 | 1 | -8/+14 |
| |\ \ \ | | | | | | | | | | | | | | | | | Implement search by extern_uid in Users API See merge request !10509 | ||||
| | * | | | Implement search by extern_uid in Users API | Robin Bobbitt | 2017-04-18 | 1 | -8/+14 |
| | |/ / | |||||
| * | | | Remove unused user activities code | Sean McGivern | 2017-04-14 | 3 | -13/+1 |
| | | | | |||||
| * | | | Expose `last_activity_on` in the User API | Rémy Coutable | 2017-04-14 | 2 | -9/+9 |
| | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |