summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* temporary[ci skip]temp1Valery Sizov2017-05-0811-39/+62
|
* Merge branch 'lm-improve-HA-docs' into 'master' Sean Packham (GitLab)2017-05-082-10/+11
|\ | | | | | | | | clarify DB/Redis HA docs See merge request !11094
| * clarify DB/Redis HA docslm-improve-HA-docsLee Matos2017-05-042-10/+11
| |
* | Merge branch 'docs/new-topic-issues' into 'master' Sean Packham (GitLab)2017-05-0836-38/+426
|\ \ | | | | | | | | | | | | | | | | | | New doc topic: issues Closes #27650 See merge request !11075
| * | New doc topic: issuesMarcia Ramos2017-05-0836-38/+426
|/ /
* | Merge branch '21393-allow-deletion-of-protected-branches' into 'master' Phil Hughes2017-05-0821-142/+375
|\ \ | | | | | | | | | | | | | | | | | | Add confirm delete protected branch modal Closes #21393 See merge request !11000
| * | Add confirm delete protected branch modalSam Rose2017-05-0821-142/+375
|/ /
* | 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
| | | | | |
| * | | | | Refine inheritance model of extended CI/CD statusesGrzegorz Bizon2017-05-0511-38/+18
| | | | | |
| * | | | | Introduce generic manual action extended status classGrzegorz Bizon2017-05-055-43/+57
| | | | | |
| * | | | | Check ability to update build on the API resourceGrzegorz Bizon2017-05-052-5/+14
| | | | | |
| * | | | | Require build to be present in the controllerGrzegorz Bizon2017-05-051-2/+1
| | | | | |
| * | | | | Authorize build update on per object basisGrzegorz Bizon2017-05-052-7/+24
| | | | | |
| * | | | | Use update build policy instead of new play policyGrzegorz Bizon2017-05-058-20/+22
| | | | | |
| * | | | | Merge commit '3a2b60f7' from 'master'Grzegorz Bizon2017-05-05302-1664/+8577
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '3a2b60f7a0109cdb84e8727a2625318a746e84dc': (151 commits) Fixed Karma spec Reject EE reserved namespace paths in CE as well Updated webpack config Include the bundler:audit job into the static-analysis job Document serializers Add artifact file page that uses the blob viewer Pipeline table mini graph dropdown remains open when table is refreshed Adds off for event hub Compile gitlab-shell go executables Allow to create new branch and empty WIP merge request from issue page Moved to a view spec Improving copy of CONTRIBUTING.md, PROCESS.md, and code_review.md Convert seconds to minutes and hours on chat notifations Disable navigation to Pages config if Pages is disabled Sort the network graph both by commit date and topographically. Add tooltips to note action buttons Add breadcrumb, build header and pipelines submenu to artifacts browser Update todos screenshots removes the possibility of commit messages having carriage returns Handle incoming emails from aliases correctly ...
| * | | | | | Improve environment policy classGrzegorz Bizon2017-05-031-5/+7
| | | | | | |
| * | | | | | Rephrase documentation for protected actions featureGrzegorz Bizon2017-05-031-3/+4
| | | | | | |
| * | | | | | Improve code style related to protected actionsGrzegorz Bizon2017-05-035-10/+8
| | | | | | |
| * | | | | | Merge branch 'master' into ↵Grzegorz Bizon2017-05-03246-1152/+4429
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/manual-actions-protected-branches-permissions * master: (103 commits) Include missing project attributes to Import/Export Create the rest of the wiki docs Fill in information about creating the wiki Home page Move wiki doc to its own index page Create initial file for Wiki documentation Default to null user when asignee is unselected Re-enable ref operations with gitaly after not-found fix #31560 Add repo parameter to gitaly:install and workhorse:install Remove N+1 queries when checking nodes visible to user Don't validate reserved words if the format doesn't match Revert "Shorten and improve some job names" Remove unused initializer DRY the `<<: *except-docs` a bit in `.gitlab-ci.yml` Make the static-analysis job be run for docs branches too Add download_snippet_path helper Refresh the markdown cache if it was `nil` Add some documentation for the new migration helpers Update comments Display comments for personal snippets Update docs on creating a project ...
| * | | | | | | Fix builds controller spec related to protected actionsGrzegorz Bizon2017-05-021-0/+2
| | | | | | | |
| * | | | | | | Fix environment policy class name in specsGrzegorz Bizon2017-05-021-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'master' into ↵Grzegorz Bizon2017-05-02764-9251/+11069
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/manual-actions-protected-branches-permissions * master: (314 commits) Better Explore Groups view Update Carrierwave and fog-core Add specs for Gitlab::RequestProfiler Add scripts/static-analysis to run all the static analysers in one go Shorten and improve some job names Group static-analysis jobs into a single job Don't blow up when email has no References header Update CHANGELOG.md for 9.1.2 Add changelog Add changelog Show Raw button as Download for binary files Use blob viewers for snippets Fix typo Fixed transient failure related to dropdown animations Revert "Merge branch 'tc-no-todo-service-select' into 'master'" fix link to MR 10416 Another change from .click -> .trigger('click') to make spec pass Change from .click -> .trigger('click') to make spec pass Disable AddColumnWithDefaultToLargeTable cop for pre-existing migrations Add AddColumnWithDefaultToLargeTable cop ... Conflicts: spec/requests/api/jobs_spec.rb
| * | | | | | | | Add Changelog entry for protected manual actionsGrzegorz Bizon2017-05-021-0/+4
| | | | | | | | |
| * | | | | | | | Document protected manual actions featureGrzegorz Bizon2017-05-021-1/+5
| | | | | | | | |
| * | | | | | | | Improve specs for jobs API regarding manual actionsGrzegorz Bizon2017-05-021-17/+50
| | | | | | | | |
| * | | | | | | | Fix Rubocop offense in environments policy classGrzegorz Bizon2017-05-012-2/+1
| | | | | | | | |
| * | | | | | | | Extend action tooltop to show info about abilitiesGrzegorz Bizon2017-05-013-31/+42
| | | | | | | | |
View Lorry Controller Status