summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | Removed format validationKirilll Zaitsev2015-09-192-4/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'rs-bump-two-factor' into 'master' Douwe Maan2015-09-2011-21/+32
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bump devise-two-factor to 2.0.0rs-bump-two-factorRobert Speicher2015-09-197-11/+16
| * | | | | | | | | | Devise 3.5.x deprecates `confirm!` in favor of `confirm`Robert Speicher2015-09-194-6/+6
| * | | | | | | | | | Bump devise to 3.5.2Robert Speicher2015-09-192-4/+10
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqRobert Schilling2015-09-201-1/+1
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #9646 from sameersbn/fix-link-to-docsRobert Schilling2015-09-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | fixes link to reply_by_email docsSameer Naik2015-09-201-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'fix-failing-migration' into 'master' Robert Speicher2015-09-192-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | fix failing migration on mysqlHannes Rosenögger2015-09-182-2/+2
* | | | | | | | | | Merge branch 'rs-issue-2597' into 'master' Robert Speicher2015-09-181-4/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix IssuableContext javascriptRobert Speicher2015-09-181-4/+5
|/ / / / / / / / /
* | | | | | | | | Merge branch 'ci_closer_integration' into 'master' Kamil Trzciński2015-09-1822-297/+31
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | remove API calls from CE to CIci_closer_integrationValery Sizov2015-09-1822-297/+31
* | | | | | | | | Fix gitlab ci projects page UIDmitriy Zaporozhets2015-09-181-9/+9
* | | | | | | | | Merge branch 'fix-doc-typo' into 'master' Robert Speicher2015-09-181-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix typo in Reply by email docsfix-doc-typoDouwe Maan2015-09-181-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'merge_request_error' into 'master' Dmitriy Zaporozhets2015-09-185-75/+13
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix CI status in the MR pageValery Sizov2015-09-185-75/+13
| |/ / / / / /
* | | | | | | Merge branch 'pg_dump_schema' into 'master' Dmitriy Zaporozhets2015-09-184-2/+9
|\ \ \ \ \ \ \
| * | | | | | | add pg_schema to backup configpg_dump_schemaValery Sizov2015-09-184-2/+9
| |/ / / / / /
* | | | | | | Merge branch 'allow-to-disable-ci' into 'master' Dmitriy Zaporozhets2015-09-1814-7/+49
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Use 400 to notify that CI API is disabledallow-to-disable-ciKamil Trzcinski2015-09-181-1/+3
| * | | | | | Allow to disable GitLab CIKamil Trzcinski2015-09-1814-7/+47
|/ / / / / /
* | | | | | Merge branch 'add-custom-text-to-help' into 'master' Jeroen van Baarsen2015-09-187-0/+17
|\ \ \ \ \ \
| * | | | | | Allow custom info to be added to Help pageJeroen van Baarsen2015-09-187-0/+17
| |/ / / / /
* | | | | | Merge branch 'fix-ci-non-public-project' into 'master' Dmitriy Zaporozhets2015-09-182-6/+1
|\ \ \ \ \ \
| * | | | | | Fix 500 when accessing private project when not logged infix-ci-non-public-projectKamil Trzcinski2015-09-172-6/+1
| |/ / / / /
* | | | | | Merge branch 'fix-trending-projects' into 'master' Dmitriy Zaporozhets2015-09-182-14/+5
|\ \ \ \ \ \
| * | | | | | Fix 500 on trending projects if isntance has 100k+ projectsDmitriy Zaporozhets2015-09-182-14/+5
| |/ / / / /
* | | | | | Merge branch 'fix-ci-settings-cancel' into 'master' Dmitriy Zaporozhets2015-09-181-1/+0
|\ \ \ \ \ \
| * | | | | | Remove Cancel button in Project settingsfix-ci-settings-cancelKamil Trzcinski2015-09-171-1/+0
| |/ / / / /
* | | | | | Merge branch 'project-header-titles' into 'master' Dmitriy Zaporozhets2015-09-1866-55/+107
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into project-header-titlesDouwe Maan2015-09-1822-253/+87
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | "Back to x" links are lowercase.project-header-titlesDouwe Maan2015-09-171-1/+1
| * | | | | | Fix active state of CI Help nav link.Douwe Maan2015-09-171-1/+1
| * | | | | | Rename "CI" in sidebar to "GitLab CI".Douwe Maan2015-09-171-1/+1
| * | | | | | Move project header title definition to view in question.Douwe Maan2015-09-1764-53/+103
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-09-188-95/+93
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'ci_projects_order' into 'master' Valery Sizov2015-09-188-95/+93
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix: ci projects orderci_projects_orderValery Sizov2015-09-178-95/+93
* | | | | | | Merge branch 'global-key' into 'master' Job van der Voort2015-09-171-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | fixed textkaren Carias2015-09-171-2/+1
| * | | | | | note about global keyskaren Carias2015-09-131-0/+3
* | | | | | | Merge branch 'remove-ci-help' into 'master'Kamil Trzciński2015-09-174-80/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove CI helpKamil Trzcinski2015-09-174-80/+0
* | | | | | | | Merge branch 'refactor-blob-upload-locals' into 'master'Dmitriy Zaporozhets2015-09-174-18/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Move partial locals out of controllerStan Hu2015-09-174-18/+11
|/ / / / / / /
* | | | | | | Merge pull request #9618 from pjknkda/repo-info-to-issue-hookStan Hu2015-09-174-0/+29
|\ \ \ \ \ \ \
| * | | | | | | add repository field to issue hook dataJungkook Park2015-09-174-0/+29
| | |_|_|_|_|/ | |/| | | | |