Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change no_limits to limitsdm-collapsed-blob | Douwe Maan | 2017-05-31 | 4 | -6/+6 |
| | |||||
* | Consistent diff and blob size limit names | Douwe Maan | 2017-05-29 | 4 | -6/+6 |
| | |||||
* | Merge branch 'rework-authorizations-performance' into 'master' | Douwe Maan | 2017-05-29 | 4 | -4/+18 |
|\ | | | | | | | | | Rework project authorizations and nested groups for better performance See merge request !10885 | ||||
| * | Hide nested group UI/API support for MySQL | Yorick Peterse | 2017-05-17 | 4 | -4/+18 |
| | | | | | | | | | | | | This hides/disables some UI elements and API parameters related to nested groups when MySQL is used, since nested groups are not supported for MySQL. | ||||
* | | Add API URL to JIRA settings31448-jira-urls | Jarka Kadlecova | 2017-05-26 | 1 | -1/+7 |
| | | |||||
* | | Merge branch 'dm-diff-cleanup' into 'master' | Robert Speicher | 2017-05-25 | 1 | -1/+3 |
|\ \ | | | | | | | | | | | | | Clean up diff rendering See merge request !11390 | ||||
| * | | Add question mark to Gitlab::Diff::File predicate methods | Douwe Maan | 2017-05-23 | 1 | -1/+3 |
| | | | |||||
* | | | Merge branch '32748-emails-are-being-sent-with-the-wrong-language' into 'master' | Douwe Maan | 2017-05-25 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Bugfix: Always use the default language when generating emails. Closes #32748 See merge request !11662 | ||||
| * | | | Bugfix: Always use the default language when generating emails.32748-emails-are-being-sent-with-the-wrong-language | Ruben Davila | 2017-05-25 | 1 | -2/+2 |
| |/ / | | | | | | | | | | | | | | | | There was a race condition issue when the application was generating an email and was using a language that was previously being used in other request. | ||||
* | | | Revert "Remove changes that are not absolutely necessary" | Douwe Maan | 2017-05-24 | 2 | -2/+2 |
| | | | | | | | | | This reverts commit b0498c176fa134761d899c9b369be12f1ca789c5 | ||||
* | | | Prevent errors from non-functional notify_post_receive endpointfix-notify-post-receive | Alejandro Rodríguez | 2017-05-18 | 1 | -8/+9 |
|/ / | |||||
* | | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' cherry-pick-0663458c | Douwe Maan | 2017-05-16 | 3 | -6/+6 |
| | | | | | | | | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287 | ||||
* | | Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'" | Douwe Maan | 2017-05-15 | 3 | -6/+6 |
| | | | | | | This reverts merge request !11287 | ||||
* | | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' | Douwe Maan | 2017-05-15 | 3 | -6/+6 |
|\ \ | | | | | | | | | | | | | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287 | ||||
| * | | Rename `build_events` to `job_events` in code | Bob Van Landuyt | 2017-05-15 | 3 | -6/+6 |
| |/ | |||||
* | | Create a Users Finder | George Andrinopoulos | 2017-05-15 | 1 | -10/+1 |
|/ | |||||
* | Update SystemHooks API to expose and handle new repository_update_events | Gabriel Mazetto | 2017-05-12 | 1 | -1/+1 |
| | |||||
* | fix for Follow-up from "Backport of Multiple Assignees featurefixes_for_multiple_issue_assignees | Valery Sizov | 2017-05-11 | 1 | -4/+4 |
| | |||||
* | Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into ↵ | Robert Speicher | 2017-05-10 | 10 | -13/+13 |
|\ | | | | | | | | | | | | | | | | | | | 'master' Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063 | ||||
| * | Enable the Style/TrailingCommaInArguments cop | Rémy Coutable | 2017-05-10 | 5 | -5/+5 |
| | | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Enable the Style/TrailingCommaInLiteral cop | Rémy Coutable | 2017-05-10 | 6 | -8/+8 |
| | | | | | | | | | | | | Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Use new SnippetsFinder signature in APIbvl-security-patches | Bob Van Landuyt | 2017-05-10 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'tc-fix-private-subgroups-shown' into 'security' | Douwe Maan | 2017-05-10 | 2 | -2/+2 |
| | | | | | | | | | | Use GroupsFinder to find subgroups the user has access to See merge request !2096 | ||||
* | | Merge branch 'snippets-finder-visibility' into 'security' | Douwe Maan | 2017-05-10 | 4 | -8/+6 |
|/ | | | | | | Refactor snippets finder & dont return internal snippets for external users See merge request !2094 | ||||
* | Use relative paths for group/project/user avatars | blackst0ne | 2017-05-10 | 2 | -5/+16 |
| | |||||
* | Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into ↵ | Kamil Trzciński | 2017-05-06 | 2 | -5/+14 |
|\ | | | | | | | | | | | | | | | | | | | 'master' Check access to a branch when user triggers manual action Closes #20261 See merge request !10494 | ||||
| * | Check ability to update build on the API resource | Grzegorz Bizon | 2017-05-05 | 2 | -5/+14 |
| | | |||||
* | | Merge branch ↵ | Sean McGivern | 2017-05-05 | 2 | -42/+20 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | '29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ce' into 'master' Generate and handle a gl_repository param to pass around components Closes #29925 See merge request !10992 | ||||
| * | | Pass GL_REPOSITORY in Workhorse responses29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ce | Alejandro Rodríguez | 2017-05-05 | 1 | -1/+1 |
| | | | |||||
| * | | Generate and handle a gl_repository param to pass around components | Alejandro Rodríguez | 2017-05-03 | 2 | -42/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This new param allows us to share project information between components that don't share or don't have access to the same filesystem mountpoints, for example between Gitaly and Rails or between Rails and Gitlab-Shell hooks. The previous parameters are still supported, but if found, gl_repository is prefered. The old parameters should be deprecated once all components support the new format. | ||||
* | | | Merge branch 'mia_backort' into 'master' | Jacob Schatz | 2017-05-05 | 8 | -20/+54 |
|\ \ \ | | | | | | | | | | | | | | | | | Backport of Multiple Assignees feature See merge request !11089 | ||||
| * \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ↵ | Valery Sizov | 2017-05-05 | 3 | -2/+5 |
| |\ \ \ | | | | | | | | | | | | | | | | skip] | ||||
| * | | | | [Multiple issue assignee]: reslving some conflicts | Valery Sizov | 2017-05-04 | 1 | -4/+0 |
| | | | | | |||||
| * | | | | Backport of multiple_assignees_feature [ci skip] | Valery Sizov | 2017-05-04 | 8 | -19/+57 |
| | | | | | |||||
* | | | | | 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 |
| | | | | | |