summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Milestoneish SQL performance partially improved and memoizedjej-memoize-milestoneish-visible-to-userJames Edwards-Jones2016-12-204-6/+40
* Merge branch 'katex-math-license' into 'master' Stan Hu2016-12-162-0/+82
|\
| * Clearer comment as to why the procedure is neededMunken2016-12-162-2/+2
| * Added KaTeX license and procedure to build it for GitlabMunken2016-12-162-0/+82
* | Merge branch 'issue_22269' into 'master' Kamil Trzciński2016-12-1639-133/+321
|\ \
| * | Fix rubocopKamil Trzcinski2016-12-161-1/+0
| * | Change SlackService to SlackNotificationsServiceissue_22269_fix_eeissue_22269Felipe Artur2016-12-1519-168/+223
| * | Mattermost Notifications ServiceFelipe Artur2016-12-1533-524/+658
* | | Merge branch 'fix/25635' into 'master' Rémy Coutable2016-12-164-23/+32
|\ \ \
| * | | Improve performance on RemoveDuplicatesFromRoutes migrationfix/25635Douglas Barbosa Alexandre2016-12-151-14/+10
| * | | Fix the AddNameIndexToNamespace migration to be reversibleDouglas Barbosa Alexandre2016-12-151-1/+1
| * | | Use optimized query to fill the routes table when running PostgreSQLDouglas Barbosa Alexandre2016-12-152-6/+19
| * | | Don't use the Route model in migrationsDouglas Barbosa Alexandre2016-12-152-2/+2
* | | | Merge branch 'gem-update-grape' into 'master' Rémy Coutable2016-12-163-7/+14
|\ \ \ \
| * | | | Update grape to 0.18.0gem-update-grapeRobert Schilling2016-12-143-7/+14
* | | | | Merge branch 'fix-21-specs' into 'master' Rémy Coutable2016-12-161-3/+3
|\ \ \ \ \
| * | | | | Fix specs in Ruby 2.1Sean McGivern2016-12-161-3/+3
* | | | | | Merge branch 'abuse_report-fixture' into 'master' Kamil Trzciński2016-12-164-34/+51
|\ \ \ \ \ \
| * | | | | | Replace static fixture for abuse_reports_spec (!7644)winniehell2016-12-154-34/+51
* | | | | | | Merge branch 'dz-add-group-policy-spec' into 'master' Sean McGivern2016-12-161-0/+108
|\ \ \ \ \ \ \
| * | | | | | | Add missing group policy specdz-add-group-policy-specDmitriy Zaporozhets2016-12-151-0/+108
* | | | | | | | Merge branch 'change_development_build_fixtures' into 'master' Sean McGivern2016-12-162-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Made Ci::Builds to have same ref as Ci::Pipeline in dev fixturestwonegatives2016-12-152-1/+5
* | | | | | | | | Merge branch 'update-custom-hooks-docs' into 'master' Sean McGivern2016-12-163-9/+17
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Update custom hooks docs and set 4.1.0update-custom-hooks-docsSean McGivern2016-12-123-9/+17
* | | | | | | | | Merge branch 'ux-guide-cursors' into 'master' Achilleas Pipinellis2016-12-167-0/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ci skip] UX Guide: add guidance on cursor usageux-guide-cursorsAllison Whilden2016-12-157-0/+16
* | | | | | | | | | Merge branch 'dz-nested-groups-title-ui' into 'master' Sean McGivern2016-12-168-8/+50
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Refactor Namespace#parents methoddz-nested-groups-title-uiDmitriy Zaporozhets2016-12-152-12/+8
| * | | | | | | | | Add tests for Namespace#full_name methodDmitriy Zaporozhets2016-12-131-0/+8
| * | | | | | | | | Use full_name for Group in UIDmitriy Zaporozhets2016-12-131-1/+1
| * | | | | | | | | Add parents method to NamespaceDmitriy Zaporozhets2016-12-132-5/+28
| * | | | | | | | | Use full group name for admin group index and show pagesDmitriy Zaporozhets2016-12-132-2/+2
| * | | | | | | | | Show full path for nested groups at dashboard groups listDmitriy Zaporozhets2016-12-132-1/+9
| * | | | | | | | | Show full path in header UI for nested groups/projectsDmitriy Zaporozhets2016-12-132-4/+11
* | | | | | | | | | Merge branch 'fix-master-eslint-errors' into 'master' Douglas Barbosa Alexandre2016-12-164-10/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix eslint errorsfix-master-eslint-errorsAlfredo Sumaran2016-12-154-10/+10
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix/build' into 'master' Douglas Barbosa Alexandre2016-12-161-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix spec/features/admin/admin_active_tab_spec.rbfix/buildDouglas Barbosa Alexandre2016-12-151-1/+1
* | | | | | | | | | | Merge branch 'katex-math-fixup' into 'master' Sean McGivern2016-12-161-4/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Don't open Asciidoc module twiceMunken2016-12-151-4/+0
* | | | | | | | | | Merge branch 'docs/add-okta-auth' into 'master' Achilleas Pipinellis2016-12-154-1/+162
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add Okta authentication documentationdocs/add-okta-authAchilleas Pipinellis2016-12-154-1/+162
* | | | | | | | | | Merge branch 'ha_docs_auto_migrate_false' into 'master' Achilleas Pipinellis2016-12-152-7/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add `gitlab_rails['auto_migrate'] = false` to HA docs for Redis/PG [ci skip]Drew Blessing2016-12-152-7/+7
* | | | | | | | | | | Merge branch '25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs...Kamil Trzciński2016-12-153-12/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Rename `issue create` slash command to `issue new`25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs-better-documentationPedro Moreira da Silva2016-12-152-2/+2
| * | | | | | | | | | | Merge branch '25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs...Pedro Moreira da Silva2016-12-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Add changelog for !7850.Pedro Moreira da Silva2016-12-071-0/+4
| | * | | | | | | | | | | Update Mattermost slash commands docs to explain how to create a newline and ...Pedro Moreira da Silva2016-11-301-11/+7