summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added editable concernfix-realtime-edited-text-for-issuesLuke "Jared" Bennett2017-05-189-11/+24
* Remove unneeded media query hiding the edited timeagoLuke "Jared" Bennett2017-05-1712-20/+233
* Fix 9-2-stable propagate service specJames Lopez2017-05-171-4/+8
* Merge branch 'sh-fix-delete-assignees-mysql' into 'master' Stan Hu2017-05-171-4/+9
* Merge branch 'fix_assignee_yourick_approach' into 'master'Douwe Maan2017-05-168-55/+207
* Update VERSION to 9.2.0-rc2v9.2.0-rc2Regis2017-05-121-1/+1
* Merge branch 'sh-relax-backup-rake-spec' into 'master' Stan Hu2017-05-121-1/+1
* Merge branch 'fix-remove-cache-key-karma' into 'master' Robert Speicher2017-05-121-3/+0
* Merge branch 'bvl-fix-dynamic-path-query' into 'master' Douwe Maan2017-05-122-1/+32
* Merge branch 'sh-fix-failing-rc1-backup-spec' into 'master' Stan Hu2017-05-121-1/+1
* Update VERSION to 9.2.0-rc1v9.2.0-rc1Regis2017-05-111-1/+1
* Merge branch '32030-transient-failure-in-spec-features-boards-boards_spec-rb'...Clement Ho2017-05-115-8/+33
* Merge branch 'enforce-current-user-usage-on-entities' into 'master' Kamil Trzciński2017-05-101-1/+1
* Merge branch 'retried-in-database-mysql' into 'master' Regis Boudinot2017-05-1018-41/+152
* Merge branch 'bvl-9-2-security-patches' into '9-2-stable' Regis Boudinot2017-05-1058-318/+846
|\
| * 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
| * Merge branch 'fix-hamlit-xss' into 'security-9-1' Robert Speicher2017-05-105-3/+29
| * Merge branch 'snippets-finder-visibility' into 'security'Douwe Maan2017-05-1023-184/+399
| * Merge branch 'branch-name-escape' into 'security'Robert Speicher2017-05-103-7/+19
| * Merge branch '31157-respect-project-features-in-wiki-search' into 'security' Douwe Maan2017-05-103-3/+80
| * Merge branch 'snippets_visibility' into 'security'Sean McGivern2017-05-104-12/+39
| * Merge branch 'rs-sanitize-submodule-urls' into 'security'Douwe Maan2017-05-103-16/+46
| * Merge branch 'bvl-security-9-1-validate-urls-in-markdown-using-uri'Robert Speicher2017-05-104-56/+86
| * Merge branch 'bvl-security-9-1-markup-pipeline'Robert Speicher2017-05-107-17/+42
|/
* remove carriage return complaints for rubocopRegis2017-05-091-1/+1
* Merge branch '26944-prometheus-memory-sparkline' into 'master' Fatih Acet2017-05-0910-74/+579
* Merge branch 'mr-widget-redesign-review' into 'master'Jacob Schatz2017-05-09195-1560/+7032
* Merge branch 'fix/gb/make-environment-policy-specs-to-pass-on-ee' into 'master' Sean McGivern2017-05-091-1/+1
* Merge branch 'Add-index_redirect_routes_path_for_link-migration-to-setup_post...Sean McGivern2017-05-091-0/+1
* Merge branch 'fix-notes_on_personal_snippets_spec-timeago-assertion-ce' into ...Sean McGivern2017-05-091-1/+3
* Merge branch 'sh-fix-almost-there-spec-mysql' into 'master' Sean McGivern2017-05-091-0/+9
* Merge branch 'update-guides-for-9-2' into 'master' Timothy Andrew2017-05-082-2/+290
* Merge branch 'update-templates-for-9-2' into 'master' Timothy Andrew2017-05-0811-1/+99
* Merge branch 'update-deps-licenses-for-9-2' into 'master' Timothy Andrew2017-05-081-139/+158
* 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
|\ \ \ \