summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix milestones_controllerblackst0ne-rails5-rename-sort-methodsblackst0ne2018-04-031-1/+1
|
* Update milestone.rbblackst0ne2018-04-031-1/+1
|
* Fix specblackst0ne2018-04-031-5/+5
|
* Fix specsblackst0ne2018-04-037-8/+8
|
* [Rails5] Rename `sort` methods with `sort_by_attribute`blackst0ne2018-04-0312-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 Ramos2018-04-021-20/+73
|\ | | | | | | | | Refactor the browser performance testing docs See merge request gitlab-org/gitlab-ce!18097
| * Refactor the browser performance testing docsdocs/performance-testingAchilleas Pipinellis2018-03-291-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 Speicher2018-04-0210-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_networkDouwe Maan2018-04-024-14/+12
| | |
| * | Make error messages even more descriptiveDouwe Maan2018-04-023-37/+51
| | |
| * | Added rescue to show a custom error when testing project integrationsFrancisco Javier López2018-04-021-0/+2
| | |
| * | Raise more descriptive errors when URLs are blockedDouwe Maan2018-04-026-26/+52
| | |
* | | Merge branch '40907-confidential-lock-icons-collapsed-sidebar' into 'master'Filipa Lacerda2018-04-0210-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 Tang2018-04-0210-163/+297
|/ / / | | | | | | | | | activate dropdown"
* | | Merge branch 'dz-type-button' into 'master'Filipa Lacerda2018-04-027-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-buttonDmitriy Zaporozhets2018-04-027-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 Speicher2018-04-023-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.1Takuya Noguchi2018-04-013-3/+8
| | | | |
* | | | | Merge branch 'docs/mirrored-repositories-for-pipelines-ce' into 'master'Marcia Ramos2018-04-023-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-ceAchilleas Pipinellis2018-03-303-2/+16
| | | | | |
* | | | | | Merge branch 'docs/lfs-s3-ce' into 'master'Marcia Ramos2018-04-021-53/+56
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Refactor the LFS S3 docs See merge request gitlab-org/gitlab-ce!18029
| * | | | | Refactor the LFS S3 docsdocs/lfs-s3-ceAchilleas Pipinellis2018-03-301-53/+57
| | | | | |
* | | | | | Merge branch 'fl-prettier-mock-data' into 'master'Clement Ho2018-04-027-882/+961
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prettify mock data files See merge request gitlab-org/gitlab-ce!18091
| * | | | | | Removes eslint disabled commentsfl-prettier-mock-dataFilipa Lacerda2018-03-297-882/+961
| | | | | | |
* | | | | | | Merge branch 'backport-to-CE-5023' into 'master'Douwe Maan2018-04-0210-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 FooterAndré Luís2018-04-0210-32/+831
|/ / / / / / /
* | | | | | | Merge branch 'jramsay-list-commit-statuses-docs' into 'master'Douwe Maan2018-04-021-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-docsJames Ramsay2018-04-011-2/+3
| | | | | | | |
* | | | | | | | Merge branch 'sh-cleanup-crlf-gitmodules' into 'master'Douwe Maan2018-04-022-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-gitmodulesStan Hu2018-03-302-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 McGivern2018-04-024-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 helperJames Edwards-Jones2018-04-024-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 McGivern2018-04-024-16/+135
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Migrate upload task fails for Groups" Closes #44776 See merge request gitlab-org/gitlab-ce!18088
| * | | | | | | | apply feedbackMicaël Bergeron2018-04-021-1/+15
| | | | | | | | |
| * | | | | | | | add changelogMicaël Bergeron2018-04-021-0/+5
| | | | | | | | |
| * | | | | | | | fix the rake task from being to strict about GroupMicaël Bergeron2018-04-023-16/+116
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch 'blackst0ne-bump-html-pipeline-gem' into 'master'Sean McGivern2018-04-026-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-gemblackst0ne2018-04-026-8/+12
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'docs-update-issue-mr-description-templates-api' into 'master'Sean McGivern2018-04-021-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 templatesVictor Wu2018-04-021-0/+4
|/ / / / / / /
* | | | | | | Merge branch 'dz-improve-app-settings-3' into 'master'Filipa Lacerda2018-04-026-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-3Dmitriy Zaporozhets2018-03-296-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ński2018-04-0229-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 methodsGrzegorz Bizon2018-03-301-1/+1
| | | | | | | | |
| * | | | | | | | Improve naming and optimize methods of the build classGrzegorz Bizon2018-03-302-7/+13
| | | | | | | | |
| * | | | | | | | Memoize environment-specific methods in build classGrzegorz Bizon2018-03-291-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 persistenceGrzegorz Bizon2018-03-292-31/+39
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into 'feature/gb/variables-expressions-in-only-except'Grzegorz Bizon2018-03-29389-2387/+8740
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/ci/build.rb
| * | | | | | | | | Copy-edit documentation for variables expressionsfeature/gb/variables-expressions-in-only-exceptGrzegorz Bizon2018-03-292-10/+13
| | | | | | | | | |
| * | | | | | | | | Add basic docs for variables expressions featureGrzegorz Bizon2018-03-282-3/+85
| | | | | | | | | |