summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump devise-two-factor to 2.0.0rs-bump-two-factorRobert Speicher2015-09-197-11/+16
| | | | | | Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605 See https://github.com/tinfoil/devise-two-factor/pull/43
* 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 'rs-issue-2597' into 'master' Robert Speicher2015-09-181-4/+5
|\ | | | | | | | | | | | | | | | | | | Fix IssuableContext javascript We were calling `affix` before the events were bound so they never triggered correctly. Closes #2597 See merge request !1356
| * Fix IssuableContext javascriptRobert Speicher2015-09-181-4/+5
|/ | | | | | | We were calling `affix` before the events were bound so they never triggered correctly. Closes #2597
* Merge branch 'ci_closer_integration' into 'master' Kamil Trzciński2015-09-1822-297/+31
|\ | | | | | | | | | | | | Remove API calls CE->CI See merge request !1307
| * 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
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'fix-doc-typo' into 'master' Robert Speicher2015-09-181-2/+2
|\ \ | |/ |/| | | | | Fix typo in Reply by email docs See merge request !1346
| * 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 page https://gitlab.com/gitlab-org/gitlab-ce/issues/2587 See merge request !1347
| * | 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 config https://dev.gitlab.org/gitlab/gitlabhq/issues/2489 See merge request !1345
| * | 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
|\ \ | |/ |/| | | | | | | | | | | | | | | | | Allow to disable GitLab CI Added simple config option to disable GitLab CI It makes all CI related requests to return 404 /cc @dzaporozhets @jacobvosmaer @vsizov See merge request !1340
| * 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 page Fixes #2536 **Admin screen** ![image](https://gitlab.com/jeroenvanbaarsen/gitlab-ce/uploads/e62f3e0ff40558fb955f09e469293521/image.png) **Text on the Help page** ![image](https://gitlab.com/jeroenvanbaarsen/gitlab-ce/uploads/ba315fb418e1698d8f44b88c7cc6c29a/image.png) /cc @DouweM See merge request !1309
| * Allow custom info to be added to Help pageJeroen van Baarsen2015-09-187-0/+17
| | | | | | | | | | | | Fixes #2536 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | Merge branch 'fix-ci-non-public-project' into 'master' Dmitriy Zaporozhets2015-09-182-6/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix 500 when accessing private project when not logged in See merge request !1336
| * | 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+ projects Fixes #2576 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1341
| * | Fix 500 on trending projects if isntance has 100k+ projectsDmitriy Zaporozhets2015-09-182-14/+5
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'fix-ci-settings-cancel' into 'master' Dmitriy Zaporozhets2015-09-181-1/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove Cancel button from CI Project settings Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/2568 See merge request !1337
| * | 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
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project header titles Fixes my issues with !1293, see [my comment](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1293#note_2112289): > No please, not this huge if/else statement again! This will get out of sync so quickly, like happened with the original page titles before the page_title helper per page :( cc @haynes See merge request !1328
| * \ 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 order https://gitlab.com/gitlab-org/gitlab-ce/issues/2553 See merge request !1333
| | * | 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
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Note about global keys Because of tweet https://twitter.com/ChoboIslah/status/639565184806309888 See merge request !1931
| * | | 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 help Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/2556 See merge request !1325
| * | | | 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 controller Some minor cleanup for upload/replace functionality: move controller variables into partial locals. See merge request !1331
| * | | | 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 data
| * | | | add repository field to issue hook dataJungkook Park2015-09-174-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add a test for to_hook_data of issue model update CHANGELOG
* | | | | Merge branch 'ci-nav-changes' into 'master'Dmitriy Zaporozhets2015-09-178-143/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrate CI navigation more tightly with project ![Screen_Shot_2015-09-17_at_09.51.56](https://gitlab.com/gitlab-org/gitlab-ce/uploads/013807ad9f89a35a4af988199c2ee92f/Screen_Shot_2015-09-17_at_09.51.56.png) ![Screen_Shot_2015-09-17_at_09.52.14](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8f9bdaafeef62fa451ee3699f003cbc4/Screen_Shot_2015-09-17_at_09.52.14.png) ![Screen_Shot_2015-09-17_at_09.52.07](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cb726bf0651ddb74c10fd7bae9a333fb/Screen_Shot_2015-09-17_at_09.52.07.png) /cc @dzaporozhets See merge request !1324
| * | | | | Fix nav_link for dashboardKamil Trzcinski2015-09-171-2/+2
| | | | | |
| * | | | | Remove duplicate codeKamil Trzcinski2015-09-171-108/+0
| | | | | |
| * | | | | Check current_controller against controller_pathKamil Trzcinski2015-09-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | The controller_path includes namespaces, where controller_name only includes the class name without controller
| * | | | | Integrate CI navigation more tightly with projectKamil Trzcinski2015-09-176-34/+22
|/ / / / /
* | | | | Merge branch 'fix-schema-downgrade' into 'master'Kamil Trzciński2015-09-171-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix schema downgrade introduced by: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1299 Fixes: https://dev.gitlab.org/ci/projects/1/refs/master/commits/2e9a7032cec02588484eb162717298d311770c7d Introduced by: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1299 See merge request !1326
| * | | | | Fix schema downgrade introduced by: ↵fix-schema-downgradeKamil Trzcinski2015-09-171-1/+2
| | |_|_|/ | |/| | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1299
View Lorry Controller Status