summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'update-guides-for-9-2' into 'master' Timothy Andrew2017-05-082-2/+290
|\
| * Update guides for 9.2.Timothy Andrew2017-05-082-2/+290
* | Merge branch '28794-standardize-jasmine-test-describe-block-names-that-test-s...Filipa Lacerda2017-05-0810-26/+53
|\ \
| * | [skip ci] add documentation28794-standardize-jasmine-test-describe-block-names-that-test-specific-methodsClement Ho2017-05-051-0/+27
| * | Standardize jasmine test describe block names that test specific methodsClement Ho2017-05-059-26/+26
* | | Merge branch '28359-skip-process-commit-worker-unless-issues-referenced' into...31977-ensure-all-webpack-bundles-which-include-vue-are-children-of-common_vue-jsDmitriy Zaporozhets2017-05-0811-13/+117
|\ \ \
| * | | Cycle analytics specs needed Commit to reference issue28359-skip-process-commit-worker-unless-issues-referencedJames Edwards-Jones2017-05-044-10/+5
| * | | Use regex to skip unnecessary reference processing in ProcessCommitWorkerJames Edwards-Jones2017-05-047-3/+112
* | | | Merge branch 'fix-notes_on_personal_snippets_spec-timeago-assertion-ce' into ...Sean McGivern2017-05-081-1/+3
|\ \ \ \
| * | | | Just assert the existence of the timeago elementLuke "Jared" Bennett2017-05-081-4/+3
| * | | | Check for all possible timeago strings that can be rendered in a few minutes....fix-notes_on_personal_snippets_spec-timeago-assertion-ceLuke "Jared" Bennett2017-05-081-1/+4
* | | | | Merge branch 'Add-index_redirect_routes_path_for_link-migration-to-setup_post...Sean McGivern2017-05-081-0/+1
|\ \ \ \ \
| * | | | | Add index_redirect_routes_path_for_link migration to setup_postgresql.rakeLuke "Jared" Bennett2017-05-081-0/+1
* | | | | | Merge branch 'winh-fix-ture-urls' into 'master' Phil Hughes2017-05-081-2/+2
|\ \ \ \ \ \
| * | | | | | Use absolute URLs for fixtures (!11133)winh-fix-ture-urlswinh2017-05-061-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'sh-fix-almost-there-spec-mysql' into 'master' Sean McGivern2017-05-081-0/+9
|\ \ \ \ \ \
| * | | | | | Fix sub-second timing comparison error for Devise confirmation periodsh-fix-almost-there-spec-mysqlStan Hu2017-05-071-0/+9
* | | | | | | Merge branch 'update-templates-for-9-2' into 'master' Timothy Andrew2017-05-0811-1/+99
|\ \ \ \ \ \ \
| * | | | | | | Update gitignore, dockerfile, and license templates for 9.2.update-templates-for-9-2Timothy Andrew2017-05-0811-1/+99
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'document-foreign-keys' into 'master' Sean McGivern2017-05-083-0/+68
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Add documentation about adding foreign keysYorick Peterse2017-05-083-0/+68
|/ / / / / /
* | | | | | Merge branch 'update-deps-licenses-for-9-2' into 'master' Timothy Andrew2017-05-081-139/+158
|\ \ \ \ \ \
| * | | | | | Update the vendor licenses file for 9.2.update-deps-licenses-for-9-2Timothy Andrew2017-05-081-139/+158
| |/ / / / /
* | | | | | 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
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |