Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix milestones_controllerblackst0ne-rails5-rename-sort-methods | blackst0ne | 2018-04-03 | 1 | -1/+1 |
| | |||||
* | Update milestone.rb | blackst0ne | 2018-04-03 | 1 | -1/+1 |
| | |||||
* | Fix spec | blackst0ne | 2018-04-03 | 1 | -5/+5 |
| | |||||
* | Fix specs | blackst0ne | 2018-04-03 | 7 | -8/+8 |
| | |||||
* | [Rails5] Rename `sort` methods with `sort_by_attribute` | blackst0ne | 2018-04-03 | 12 | -20/+20 |
| | | | | | | Rails 5.0 now has Enumerable included in ActiveRecord::Relation https://github.com/rails/rails/commit/b644964b2b555798fc4b94d384b98438db863b3f So the `sort` methods should be renamed to avoid conflicts with Enumerable#sort | ||||
* | Merge branch 'docs/performance-testing' into 'master' | Marcia Ramos | 2018-04-02 | 1 | -20/+73 |
|\ | | | | | | | | | Refactor the browser performance testing docs See merge request gitlab-org/gitlab-ce!18097 | ||||
| * | Refactor the browser performance testing docsdocs/performance-testing | Achilleas Pipinellis | 2018-03-29 | 1 | -20/+73 |
| | | | | | | | | | | From my experience in setting this up https://gitlab.com/gitlab-com/gitlab-docs/merge_requests/231/diffs | ||||
* | | Merge branch 'dm-gitlab-http-blocked-url-error' into 'master' | Robert Speicher | 2018-04-02 | 10 | -50/+90 |
|\ \ | | | | | | | | | | | | | Raise more descriptive errors when URLs are blocked See merge request gitlab-org/gitlab-ce!18058 | ||||
| * | | Rename allow_private_networks to allow_local_network | Douwe Maan | 2018-04-02 | 4 | -14/+12 |
| | | | |||||
| * | | Make error messages even more descriptive | Douwe Maan | 2018-04-02 | 3 | -37/+51 |
| | | | |||||
| * | | Added rescue to show a custom error when testing project integrations | Francisco Javier López | 2018-04-02 | 1 | -0/+2 |
| | | | |||||
| * | | Raise more descriptive errors when URLs are blocked | Douwe Maan | 2018-04-02 | 6 | -26/+52 |
| | | | |||||
* | | | Merge branch '40907-confidential-lock-icons-collapsed-sidebar' into 'master' | Filipa Lacerda | 2018-04-02 | 10 | -163/+297 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Clicking confidential and lock icons on sidebar should also activate dropdown" Closes #40907 See merge request gitlab-org/gitlab-ce!17869 | ||||
| * | | | Resolve "Clicking confidential and lock icons on sidebar should also ↵ | Dennis Tang | 2018-04-02 | 10 | -163/+297 |
|/ / / | | | | | | | | | | activate dropdown" | ||||
* | | | Merge branch 'dz-type-button' into 'master' | Filipa Lacerda | 2018-04-02 | 7 | -14/+14 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add button type to settings toggle Closes #44737 See merge request gitlab-org/gitlab-ce!18134 | ||||
| * | | | Add button type to settings toggledz-type-button | Dmitriy Zaporozhets | 2018-04-02 | 7 | -14/+14 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | Merge branch '44878-update-brakeman-3.6.1-to-4.2.1' into 'master' | Robert Speicher | 2018-04-02 | 3 | -3/+8 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update brakeman to 4.2.1 Closes #44878 See merge request gitlab-org/gitlab-ce!18122 | ||||
| * | | | | Update brakeman 3.6.1 to 4.2.1 | Takuya Noguchi | 2018-04-01 | 3 | -3/+8 |
| | | | | | |||||
* | | | | | Merge branch 'docs/mirrored-repositories-for-pipelines-ce' into 'master' | Marcia Ramos | 2018-04-02 | 3 | -2/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Provide clarification on mirrored repositories for pipelines See merge request gitlab-org/gitlab-ce!18105 | ||||
| * | | | | | Provide clarification on mirrored repositories for pipelinesdocs/mirrored-repositories-for-pipelines-ce | Achilleas Pipinellis | 2018-03-30 | 3 | -2/+16 |
| | | | | | | |||||
* | | | | | | Merge branch 'docs/lfs-s3-ce' into 'master' | Marcia Ramos | 2018-04-02 | 1 | -53/+56 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | Refactor the LFS S3 docs See merge request gitlab-org/gitlab-ce!18029 | ||||
| * | | | | | Refactor the LFS S3 docsdocs/lfs-s3-ce | Achilleas Pipinellis | 2018-03-30 | 1 | -53/+57 |
| | | | | | | |||||
* | | | | | | Merge branch 'fl-prettier-mock-data' into 'master' | Clement Ho | 2018-04-02 | 7 | -882/+961 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prettify mock data files See merge request gitlab-org/gitlab-ce!18091 | ||||
| * | | | | | | Removes eslint disabled commentsfl-prettier-mock-data | Filipa Lacerda | 2018-03-29 | 7 | -882/+961 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'backport-to-CE-5023' into 'master' | Douwe Maan | 2018-04-02 | 10 | -32/+831 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes in EE MR 4972: System Header and Footer See merge request gitlab-org/gitlab-ce!18001 | ||||
| * | | | | | | | Backport changes in EE MR 4972: System Header and Footer | André Luís | 2018-04-02 | 10 | -32/+831 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'jramsay-list-commit-statuses-docs' into 'master' | Douwe Maan | 2018-04-02 | 1 | -2/+3 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pagination docs to commit status API See merge request gitlab-org/gitlab-ce!18124 | ||||
| * | | | | | | | Add pagination docs to commit status APIjramsay-list-commit-statuses-docs | James Ramsay | 2018-04-01 | 1 | -2/+3 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'sh-cleanup-crlf-gitmodules' into 'master' | Douwe Maan | 2018-04-02 | 2 | -2/+5 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle CR-LFs properly in .gitmodules file Closes #2262 See merge request gitlab-org/gitlab-ce!18117 | ||||
| * | | | | | | | | Handle CR-LFs properly in .gitmodules filesh-cleanup-crlf-gitmodules | Stan Hu | 2018-03-30 | 2 | -2/+5 |
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any submodule lines that had a CR-LF ending would be ignored by the parser. Closes gitlab-org/gitlab-ce#2262 | ||||
* | | | | | | | | Merge branch 'ce-jej/settings-for-saml-sso-per-group' into 'master' | Sean McGivern | 2018-04-02 | 4 | -0/+33 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Backport SAML settings changes (Adds validators and rack cookie helper) See merge request gitlab-org/gitlab-ce!18033 | ||||
| * | | | | | | | | Adds validators and rack cookie helper | James Edwards-Jones | 2018-04-02 | 4 | -0/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes are backported from EE, related to SAML settings in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4549 | ||||
* | | | | | | | | | Merge branch '44776-fix-upload-migrate-fails-for-group' into 'master' | Sean McGivern | 2018-04-02 | 4 | -16/+135 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Migrate upload task fails for Groups" Closes #44776 See merge request gitlab-org/gitlab-ce!18088 | ||||
| * | | | | | | | | apply feedback | Micaël Bergeron | 2018-04-02 | 1 | -1/+15 |
| | | | | | | | | | |||||
| * | | | | | | | | add changelog | Micaël Bergeron | 2018-04-02 | 1 | -0/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | fix the rake task from being to strict about Group | Micaël Bergeron | 2018-04-02 | 3 | -16/+116 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'blackst0ne-bump-html-pipeline-gem' into 'master' | Sean McGivern | 2018-04-02 | 6 | -8/+12 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump html-pipeline to 2.7.1 Closes #24039 See merge request gitlab-org/gitlab-ce!18132 | ||||
| * | | | | | | | Bump html-pipeline to 2.7.1blackst0ne-bump-html-pipeline-gem | blackst0ne | 2018-04-02 | 6 | -8/+12 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'docs-update-issue-mr-description-templates-api' into 'master' | Sean McGivern | 2018-04-02 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update docs for API for issue and merge request description templates See merge request gitlab-org/gitlab-ce!18114 | ||||
| * | | | | | | | Update docs for API for issue and merge request description templates | Victor Wu | 2018-04-02 | 1 | -0/+4 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'dz-improve-app-settings-3' into 'master' | Filipa Lacerda | 2018-04-02 | 6 | -137/+201 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redesign application settings to match project settings (part 3) See merge request gitlab-org/gitlab-ce!18056 | ||||
| * | | | | | | | Move background jobs, spam and performance bar app settings to expandable ↵dz-improve-app-settings-3 | Dmitriy Zaporozhets | 2018-03-29 | 6 | -137/+201 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sections Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | | | | | | Merge branch 'feature/gb/variables-expressions-in-only-except' into 'master' | Kamil Trzciński | 2018-04-02 | 29 | -133/+600 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipeline variables expression in only/except configuration Closes #37397 See merge request gitlab-org/gitlab-ce!17316 | ||||
| * | | | | | | | | Fix build variables policy after renaming methods | Grzegorz Bizon | 2018-03-30 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Improve naming and optimize methods of the build class | Grzegorz Bizon | 2018-03-30 | 2 | -7/+13 |
| | | | | | | | | | |||||
| * | | | | | | | | Memoize environment-specific methods in build class | Grzegorz Bizon | 2018-03-29 | 1 | -5/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The purpose of this memoization is to make getting persisted environment name, and related scoped variables, a little more performant task, because it can be invoked multiple times. | ||||
| * | | | | | | | | Extract build variables that depend on persistence | Grzegorz Bizon | 2018-03-29 | 2 | -31/+39 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into 'feature/gb/variables-expressions-in-only-except' | Grzegorz Bizon | 2018-03-29 | 389 | -2387/+8740 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/ci/build.rb | ||||
| * | | | | | | | | | Copy-edit documentation for variables expressionsfeature/gb/variables-expressions-in-only-except | Grzegorz Bizon | 2018-03-29 | 2 | -10/+13 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Add basic docs for variables expressions feature | Grzegorz Bizon | 2018-03-28 | 2 | -3/+85 |
| | | | | | | | | | |