summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't make Commit#raw_deltas privateJacob Vosmaer2017-05-091-4/+4
* Don't use DiffCollection for deltasJacob Vosmaer2017-05-095-6/+14
* Merge branch 'lm-improve-HA-docs' into 'master' Sean Packham (GitLab)2017-05-082-10/+11
|\
| * 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: 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 modalSam Rose2017-05-0821-142/+375
|/ /
* | Merge branch 'fix/gl-project-id' into 'master'James Lopez2017-05-082-7/+0
|\ \
| * | 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
|\ \ \
| * | | Remove stubbing from Gitlab::GitalyClient::Commit specsAhmad Sherif2017-05-071-8/+3
| * | | 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-depreca...revert-58d1cd6bStan Hu2017-05-071-1/+1
* | | | | Merge branch 'zj-better-view-pipeline-schedule' into 'master' Kamil Trzciński2017-05-0783-413/+1841
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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' in...Stan Hu2017-05-071-1/+1
|\ \ \ \
| * | | | 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' in...Stan Hu2017-05-071-1/+1
|\ \ \ \ \
| * | | | | Cast ENV['RSPEC_PROFILING_POSTGRES_URL'] to symbol in establish_connection ca...fix-rspec_profiling-establish_connection-string-deprecationLuke "Jared" Bennett2017-05-071-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'correctly-stub-application-settings-in_signup_spec' into 'master' Stan Hu2017-05-071-2/+2
|\ \ \ \ \
| * | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into ...Kamil Trzciński2017-05-0649-184/+732
|\ \ \ \ \
| * | | | | Do not reprocess actions when user retries pipelinefeature/gb/manual-actions-protected-branches-permissionsGrzegorz Bizon2017-05-052-1/+45
| * | | | | 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
| |\ \ \ \ \
| * | | | | | 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 feature/gb/manual-actions-protected-branches-permi...Grzegorz Bizon2017-05-03246-1152/+4429
| |\ \ \ \ \ \
| * | | | | | | 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 feature/gb/manual-actions-protected-branches-permi...Grzegorz Bizon2017-05-02764-9251/+11069
| |\ \ \ \ \ \ \
| * | | | | | | | 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