summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 9.2.0-rc1v9.2.0-rc1Regis2017-05-111-1/+1
|
* Merge branch ↵Clement Ho2017-05-115-8/+33
| | | | | | | | | | '32030-transient-failure-in-spec-features-boards-boards_spec-rb' into 'master' Fix transient job failures relating to "unhandled Promise rejection" in issue boards Closes #32030 See merge request !11222
* Merge branch 'enforce-current-user-usage-on-entities' into 'master' Kamil Trzciński2017-05-101-1/+1
| | | | | Make all Serializers receive `current_user` instead `user` [CE] See merge request !11254
* Merge branch 'retried-in-database-mysql' into 'master' Regis Boudinot2017-05-1018-41/+152
| | | | | | | Retried in database Closes #25737 See merge request !11115
* Merge branch 'bvl-9-2-security-patches' into '9-2-stable' Regis Boudinot2017-05-1058-318/+846
|\ | | | | | | | | Security patches -> `9-2-stable` See merge request !11234
| * Use new SnippetsFinder signature in APIbvl-9-2-security-patchesBob Van Landuyt2017-05-101-2/+2
| |
| * Use `described_class` in SnippetsFinder-specBob Van Landuyt2017-05-101-21/+21
| |
| * Merge branch 'tc-fix-private-subgroups-shown' into 'security' Douwe Maan2017-05-108-19/+105
| | | | | | | | | | Use GroupsFinder to find subgroups the user has access to See merge request !2096
| * Merge branch 'fix-hamlit-xss' into 'security-9-1' Robert Speicher2017-05-105-3/+29
| | | | | | | | | | New Hamlit XSS fix, does not include extraneous changes See merge request !2095
| * Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan2017-05-1023-184/+399
| | | | | | | | | | | | Refactor snippets finder & dont return internal snippets for external users See merge request !2094
| * Merge branch 'branch-name-escape' into 'security'Robert Speicher2017-05-103-7/+19
| | | | | | | | | | | | Fix XSS in branches dropdown See merge request !2093
| * Merge branch '31157-respect-project-features-in-wiki-search' into 'security' Douwe Maan2017-05-103-3/+80
| | | | | | | | | | Respect project features in wiki and blob search See merge request !2089
| * Merge branch 'snippets_visibility' into 'security'Sean McGivern2017-05-104-12/+39
| | | | | | | | | | | | Fix snippets visibility for show action - external users can not see internal snippets See merge request !2087
| * Merge branch 'rs-sanitize-submodule-urls' into 'security'Douwe Maan2017-05-103-16/+46
| | | | | | | | | | | | Sanitize submodule URLs before linking to them in the file tree view See merge request !2084
| * Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri'Robert Speicher2017-05-104-56/+86
| | | | | | | | | | | | (security-9-1) Add correct `rel` attributes to external links when rendering markdown See merge request !2097
| * Merge branch 'bvl-security-9-1-markup-pipeline'Robert Speicher2017-05-107-17/+42
|/ | | | | | (security-9-1) Render asciidoc & other markup using banzai in a pipeline See merge request !2098
* remove carriage return complaints for rubocopRegis2017-05-091-1/+1
|
* Merge branch '26944-prometheus-memory-sparkline' into 'master' Fatih Acet2017-05-0910-74/+579
| | | | | | | Add Prometheus memory sparkline to MR widget Closes #26944 See merge request !11209
* Merge branch 'mr-widget-redesign-review' into 'master'Jacob Schatz2017-05-09195-1560/+7032
| | | | | | | | Merge request widget redesign Closes #25424 and #27950 See merge request !10319
* Merge branch 'fix/gb/make-environment-policy-specs-to-pass-on-ee' into 'master' Sean McGivern2017-05-091-1/+1
| | | | | Robustify environment policy specs to pass on EE See merge request !11203
* Merge branch ↵Sean McGivern2017-05-091-0/+1
| | | | | | | | 'Add-index_redirect_routes_path_for_link-migration-to-setup_postgresql' into 'master' Add index_redirect_routes_path_for_link migration to setup_postgresql See merge request !11165
* Merge branch 'fix-notes_on_personal_snippets_spec-timeago-assertion-ce' into ↵Sean McGivern2017-05-091-1/+3
| | | | | | | | | | 'master' Fix notes_on_personal_snippets_spec Closes #31938 See merge request !11160
* Merge branch 'sh-fix-almost-there-spec-mysql' into 'master' Sean McGivern2017-05-091-0/+9
| | | | | | | Fix sub-second timing comparison error for Devise confirmation period Closes gitlab-ee#2362 See merge request !11156
* Merge branch 'update-guides-for-9-2' into 'master' Timothy Andrew2017-05-082-2/+290
| | | | | Update guides for 9.2 See merge request !11157
* Merge branch 'update-templates-for-9-2' into 'master' Timothy Andrew2017-05-0811-1/+99
| | | | | Update gitignore, dockerfile, and license templates for 9.2 See merge request !11158
* Merge branch 'update-deps-licenses-for-9-2' into 'master' Timothy Andrew2017-05-081-139/+158
| | | | | Update the vendor licenses file for 9.2 See merge request !11159
* Merge branch 'fix/gl-project-id' into 'master'James Lopez2017-05-082-7/+0
|\ | | | | | | | | | | | | Omit gl_project_id from Import/Export Closes #29813 See merge request !11032
| * remove gl_project_id for I/E version updatefix/gl-project-idJames Lopez2017-05-022-7/+0
| |
* | Merge branch 'fix/support-gitaly-commit-diff-flags' into 'master' Robert Speicher2017-05-077-49/+46
|\ \ | | | | | | | | | | | | | | | | | | Add support for commit diff ignore_whitespace_change and paths flags Closes gitaly#198 See merge request !11028
| * | Remove stubbing from Gitlab::GitalyClient::Commit specsAhmad Sherif2017-05-071-8/+3
| | | | | | | | | | | | Closes gitaly#198
| * | Re-enable Gitaly commit_raw_diff featureAhmad Sherif2017-05-076-41/+43
| | |
* | | Merge branch 'revert-58d1cd6b' into 'master' Stan Hu2017-05-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Revert "Merge branch 'fix-rspec_profiling-establish_connection-string-deprecation' into 'master'" See merge request !11153
| * | | Revert "Merge branch ↵revert-58d1cd6bStan Hu2017-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | 'fix-rspec_profiling-establish_connection-string-deprecation' into 'master'" This reverts merge request !11150
* | | | Merge branch 'zj-better-view-pipeline-schedule' into 'master' Kamil Trzciński2017-05-0783-413/+1841
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Add Pipeline Schedules that supersedes experimental Trigger Schedule Closes #30882 See merge request !10853
| * | | Add Pipeline Schedules that supersedes experimental Trigger ScheduleZeger-Jan van de Weg2017-05-0783-413/+1841
|/ / /
* | | Merge branch 'another-attempt-at-access_control_ce_spec-transient-failure' ↵Stan Hu2017-05-071-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Another attempt at access_control_ce_spec Closes #31827 See merge request !11123
| * | | Another attempt at access_control_ce_specanother-attempt-at-access_control_ce_spec-transient-failureLuke "Jared" Bennett2017-05-051-1/+1
| | | |
* | | | Merge branch 'fix-rspec_profiling-establish_connection-string-deprecation' ↵Stan Hu2017-05-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Cast ENV['RSPEC_PROFILING_POSTGRES_URL'] to symbol in establish_connection call … See merge request !11150
| * | | | Cast ENV['RSPEC_PROFILING_POSTGRES_URL'] to symbol in establish_connection ↵fix-rspec_profiling-establish_connection-string-deprecationLuke "Jared" Bennett2017-05-071-1/+1
| | |/ / | |/| | | | | | | | | | call of rspec_profiling.rb
* | | | Merge branch 'correctly-stub-application-settings-in_signup_spec' into 'master' Stan Hu2017-05-071-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Correctly stub application settings in signup_spec.rb See merge request !11151
| * | | | Correctly stub application settings in signup_spec.rbcorrectly-stub-application-settings-in_signup_specLuke "Jared" Bennett2017-05-071-2/+2
| |/ / /
* | | | Merge branch '25226-realtime-pipelines-fe' into 'master' Kamil Trzciński2017-05-0742-360/+1377
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Rewrite Pipeline Graph in Vue.js to allow realtime Closes #25226 and #31557 See merge request !10878
| * | | Fix test|25226-realtime-pipelines-feZ.J. van de Weg2017-05-071-3/+1
| | | |
| * | | Make test that actually displays pipeline graphKamil Trzcinski2017-05-072-67/+54
| | | |
| * | | Move file loading to the top of the fileFilipa Lacerda2017-05-061-4/+4
| | | |
| * | | Adds missing CSS classFilipa Lacerda2017-05-061-0/+5
| | | |
| * | | Merge branch 'master' into 25226-realtime-pipelines-feFilipa Lacerda2017-05-0653-187/+772
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (40 commits) Use GitLab Pages v0.4.2 Do not reprocess actions when user retries pipeline Add specs for extended status for manual actions Refine inheritance model of extended CI/CD statuses Introduce generic manual action extended status class Check ability to update build on the API resource Require build to be present in the controller Authorize build update on per object basis Use update build policy instead of new play policy Improve environment policy class Rephrase documentation for protected actions feature Improve code style related to protected actions Add changelog entry for external env URL btn fix Hide environment external URL button if not defined Fix builds controller spec related to protected actions Fix environment policy class name in specs Add Changelog entry for protected manual actions Document protected manual actions feature Improve specs for jobs API regarding manual actions Fix Rubocop offense in environments policy class ...
* | | | Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into ↵Kamil Trzciński2017-05-0649-184/+732
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Check access to a branch when user triggers manual action Closes #20261 See merge request !10494
| * | | | Do not reprocess actions when user retries pipelinefeature/gb/manual-actions-protected-branches-permissionsGrzegorz Bizon2017-05-052-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | User who is not allowed to trigger manual actions should not be allowed to reprocess / retrigger / retry these actions.
| * | | | Add specs for extended status for manual actionsGrzegorz Bizon2017-05-051-0/+56
| | | | |
View Lorry Controller Status