summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSION to 9.1.2v9.1.2Timothy Andrew2017-05-011-1/+1
|
* Update CHANGELOG.md for 9.1.2Timothy Andrew2017-05-019-32/+11
| | | [ci skip]
* Merge branch 'fix-sidebar-block-ref-test' into 'master' Sean McGivern2017-04-282-5/+4
| | | | | add issues and merge-requests classes and use to find in rspec See merge request !10980
* Merge branch 'zj-accept-default-branch-param' into 'master' Douwe Maan2017-04-283-1/+6
| | | | | | | Accept default branch param on notifaction services Closes #31173 See merge request !10959
* Merge branch 'pages-0.4.1' into 'master' Kamil Trzciński2017-04-282-1/+5
| | | | | Use GitLab Pages v0.4.1 See merge request !10891
* Merge branch 'add_index_on_ci_runners_contacted_at' into 'master' Yorick Peterse2017-04-283-1/+25
| | | | | | | Add index on ci_runners.contacted_at Closes #31229 See merge request !10876
* Merge branch 'fix/github-importer' into 'master' Sean McGivern2017-04-2822-101/+930
| | | | | Refactoring rake task to import GitHub repositories See merge request !10695
* Merge branch 'opt-out-not-in' into 'master' Sean McGivern2017-04-281-1/+1
| | | | | correct documentation on opt-out-ness of usage ping See merge request !10945
* Merge branch 'dm-fix-ghost-user-validation' into 'master' Robert Speicher2017-04-283-1/+17
| | | | | Skip validation when creating internal (ghost, service desk) users See merge request !10949
* Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-285-7/+73
| | | | | | | Fix ordering of commits in the network graph. Closes #30973 See merge request !10936
* Merge branch ↵Sean McGivern2017-04-283-1/+29
| | | | | | | | | | '31292-milestone-sidebar-display-incorect-number-of-mr-when-minimized' into 'master' Resolve "Milestone sidebar display incorect number of MR when minimized" Closes #31292 See merge request !10933
* Merge branch '30645-show-pipeline-events-description' into 'master' Kamil Trzciński2017-04-282-2/+6
| | | | | | | Remove description for build_events, add pipeline_events Closes #30645 See merge request !10908
* Merge branch '2246-uuid-is-nil-for-new-installation' into 'master'Sean McGivern2017-04-285-1/+25
| | | | | | | | Lazily set UUID in ApplicationSetting for new installations Closes gitlab-ee#2246 See merge request !10893
* Update VERSION to 9.1.1v9.1.1Lin Jen-Shin2017-04-261-1/+1
|
* Update CHANGELOG.md for 9.1.1Lin Jen-Shin2017-04-2613-49/+15
| | | [ci skip]
* Merge branch '31294-fix-oauth-users-do-not-need-to-be-confirmed' into ↵Sean McGivern2017-04-265-9/+61
|\ | | | | | | | | | | | | | | '9-1-stable' Ensures that OAuth/LDAP/SAML users don't need to be confirmed See merge request !10925
| * Fix logic in Users::CreateService broken by the fix for OAuth usersRémy Coutable2017-04-261-8/+15
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * Ensures that OAuth/LDAP/SAML users don't need to be confirmedRémy Coutable2017-04-265-4/+49
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '31280-skip-issueables-without-project' into 'master' Sean McGivern2017-04-264-26/+65
|/ | | | | | | Skip issuable without a project in IssuableExtractor#extract Closes #31280 See merge request !10906
* Merge branch '31174-project-integration-service-sub-nav' into 'master' Alfredo Sumaran2017-04-264-2/+7
| | | | | | | Add sub-nav for Project Integration Services edit page Closes #31174 See merge request !10813
* Merge branch 'fix-usage-ping-doc-link' into 'master' Rémy Coutable2017-04-262-1/+5
| | | | | Fix usage ping docs link from empty cohorts page See merge request !10907
* Merge branch 'rc/dm-fix-oauth-user-creation-9-1-stable' into '9-1-stable' Robert Speicher2017-04-256-5/+47
|\ | | | | | | | | Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabled See merge request !10904
| * Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabledrc/dm-fix-oauth-user-creation-9-1-stableDouwe Maan2017-04-256-5/+47
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch '10860-stable-task-lists-wrap' into '9-1-stable' Jacob Schatz2017-04-252-13/+24
|\ \ | |/ |/| | | | | Wrap MR content -stable branch See merge request !10914
| * Wrap MR content -stable branchAnnabel Dunstone Gray2017-04-252-13/+24
|/
* Merge branch '30306-transaction-while-moving-issues-to-ghost-user' into ↵Yorick Peterse2017-04-254-11/+97
| | | | | | | | 'master' Add a transaction around `move_issues_to_ghost_user` See merge request !10465
* Merge branch 'tc-realtime-every-pipeline-on-mr' into 'master' Kamil Trzciński2017-04-257-88/+137
| | | | | | | Properly expire cache for **all** MRs of a pipeline Closes #31040 See merge request !10770
* Merge branch 'fix/gb/fix-blocked-pipeline-duration' into 'master' Kamil Trzciński2017-04-253-20/+53
| | | | | | | Fix missing duration for blocked pipelines Closes #31264 See merge request !10856
* Merge branch 'fix/gb/fix-incorrect-commit-status-badge-text' into 'master' Kamil Trzciński2017-04-256-21/+114
| | | | | Fix incorrect commit status text on main project page See merge request !10863
* Merge branch 'add_index_on_ci_builds_updated_at' into 'master' Yorick Peterse2017-04-253-1/+25
| | | | | | | Add index on ci_builds.updated_at Closes #31251 See merge request !10870
* Merge branch 'gitaly-upgrade-doc' into 'master' Sean McGivern2017-04-251-0/+11
| | | | | | | Fix 9.1 Gitaly source update steps Closes #31288 See merge request !10877
* Merge branch 'sh-optimize-milestone-polymorphic-url' into 'master' Sean McGivern2017-04-254-5/+28
| | | | | Eliminate N+1 queries in loading namespaces for every issuable in milestones See merge request !10871
* Merge branch 'dm-fix-individual-notes-reply-attributes' into 'master' Sean McGivern2017-04-254-1/+22
| | | | | | | Ensure replying to an individual note by email creates a note with its own discussion ID Closes #31067 See merge request !10890
* Merge branch '30676-project-export-email' into 'master' Sean McGivern2017-04-242-1/+17
| | | | | | | Fix email not being sent after project export Closes #30676 See merge request !10578
* Update VERSION to 9.1.0v9.1.0Felipe Artur2017-04-221-1/+1
|
* Update CHANGELOG.md for 9.1.0Felipe Artur2017-04-22246-990/+248
| | | [ci skip]
* Update VERSION to 9.1.0-rc7v9.1.0-rc7DJ Mountney2017-04-211-1/+1
|
* Revert "Merge branch ↵Felipe Artur2017-04-218-129/+29
| | | | | | '30637-replace-delete-buttons-get-fork-cancel-confirmation' into 'master'" This reverts commit 0385b5b372dc2040dd4b39ed21b543ed263db55b.
* Update VERSION to 9.1.0-rc6v9.1.0-rc6Felipe Artur2017-04-211-1/+1
|
* Merge branch 'resolvable-discussions-docs' into 'master' Achilleas Pipinellis2017-04-2119-108/+154
| | | | | discussions docs See merge request !10390
* Merge branch 'sh-fix-issue-31215-2' into 'master' Douwe Maan2017-04-223-1/+30
| | | | | | | Based on !10841 Fix Error 500 when referencing issue with project in pending delete Closes #31215 See merge request !10843
* Merge branch 'docs/mention-microsoft-teams' into 'master' Achilleas Pipinellis2017-04-222-3/+4
| | | | | Mention Microsoft teams service in project services doc See merge request !10815
* Merge branch '2989-run-cicd-pipelines-on-a-schedule-experimental-doc' into ↵Achilleas Pipinellis2017-04-225-1/+29
| | | | | | | | | | 'master' Add doc for scheduled trigger Closes #30440 See merge request !10591
* Merge branch '31189-pipelines-error-state-stable' into '9-1-stable' Phil Hughes2017-04-213-6/+24
|\ | | | | | | | | Port of 31189-pipelines-error-state to 9-1-stable See merge request !10844
| * Port of 31189-pipelines-error-state to 9-1-stable31189-pipelines-error-state-stableFilipa Lacerda2017-04-213-6/+24
| |
* | Merge branch 'fix-user-activity-api' into 'master' Robert Speicher2017-04-211-1/+1
| | | | | | | | | | | | | | Fix user activities API version in docs [ci skip] See merge request !10822
* | Merge branch 'fix/encoding-issue' into 'master' Sean McGivern2017-04-213-1/+15
| | | | | | | | | | | | | | Fix encoding issue exporting a project Closes #31186 See merge request !10824
* | Merge branch 'fix-jobs-enabled-parameter' into 'master'Sean McGivern2017-04-213-2/+51
| | | | | | | | | | | | | | | | Replace builds_enabled with jobs_enabled in projects API v4 Closes #31012 See merge request !10786
* | Merge branch '30637-replace-delete-buttons-get-fork-cancel-confirmation' ↵Filipa Lacerda2017-04-218-29/+129
| | | | | | | | | | | | | | | | | | | | into 'master' Add Fork/Cancel confirmation to "Replace"/"Delete" buttons Closes #30637 See merge request !10602
* | Merge branch 'zj-update-ci-templates' into 'master' Kamil Trzciński2017-04-213-8/+86
|/ | | | | Update CI templates to include 9.1 templates See merge request !10807