Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-09-21Merge branch 'master' into 8-0-stableRobert Speicher
2015-09-21Merge branch 'reply-by-email-diff' into 'master' Robert Speicher
Fix reply by email for comments on a specific line in a diff/commit. Fixes #2363. See merge request !1364
2015-09-20Merge branch 'gmail_actions_doc' into 'master' Job van der Voort
Add Gmail actions button for GitLab doc. Resolves #1517 by adding doc with some notes. See merge request !1327
2015-09-20Merge branch 'fix-ci-link-on-project-page' into 'master' Kamil Trzciński
Fix 500 when showing project page and there's no CI project present This fixes 500 when: 1. GitLabCiService is active 2. There's no project in ci_projects table See merge request !1338
2015-09-20Fix reply by email for comments on a specific line in a diff/commit.Douwe Maan
2015-09-20Merge branch 'style-pagination' into 'master' Dmitriy Zaporozhets
Apply new design to pagination Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @skyruler See merge request !1362
2015-09-20Merge branch 'ci-build-list' into 'master' Dmitriy Zaporozhets
Style CI project/build list * return `bs-callout` css class to fix few UI issues * refactor build status helpers * style CI project page (#2545) * style build page by re-using existing UI components * style CI commit page by re-using existing UI components Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1339
2015-09-20Merge branch 'jwt' into 'master' Douwe Maan
Removed format validation **What does this MR do?** Removals format validation for drone token **Are there points in the code the reviewer needs to double check?** Nothing **Why was this MR needed?** because drone migrated to JWT tokens and JWT token doesn't valid with current format ( i don't know how many symbols JWT can use for this ) See merge request !1359
2015-09-20Merge branch 'rs-bump-two-factor' into 'master' Douwe Maan
Bump devise-two-factor to 2.0.0 Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605 See https://github.com/tinfoil/devise-two-factor/pull/43 See merge request !1363
2015-09-20Merge branch 'master' of github.com:gitlabhq/gitlabhqRobert Schilling
2015-09-20Merge pull request #9646 from sameersbn/fix-link-to-docsRobert Schilling
fixes link to reply_by_email docs
2015-09-20fixes link to reply_by_email docsSameer Naik
2015-09-20Bump devise-two-factor to 2.0.0Robert Speicher
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605 See https://github.com/tinfoil/devise-two-factor/pull/43
2015-09-20Devise 3.5.x deprecates `confirm!` in favor of `confirm`Robert Speicher
2015-09-20Bump devise to 3.5.2Robert Speicher
2015-09-20Merge branch 'fix-failing-migration' into 'master' Robert Speicher
Fix failing migration on mysql We didn't specify that the db user needs the right to create temporary tables before. That's why the migration will fail on most installations that installed gitlab according to our documentation. This MR removes the "TEMPORARY" from the migration and changes the documentation to include the necessary rights for the future. Fixes #2590 See merge request !1351
2015-09-19Apply new design to paginationDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-19Removed format validationKirilll Zaitsev
2015-09-19Cleanup GitLab CI UIDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-19Return callout css for CIDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-19Merge branch 'master' into ci-build-listDmitriy Zaporozhets
2015-09-19Merge branch 'rs-issue-2597' into 'master' Robert Speicher
Fix IssuableContext javascript We were calling `affix` before the events were bound so they never triggered correctly. Closes #2597 See merge request !1356
2015-09-18Fix IssuableContext javascriptRobert Speicher
We were calling `affix` before the events were bound so they never triggered correctly. Closes #2597
2015-09-18Merge branch 'master' into 8-0-stableRobert Speicher
2015-09-18Fix 500 when showing project page and there's no CI project presentKamil Trzcinski
2015-09-18Merge branch 'ci_closer_integration' into 'master' Kamil Trzciński
Remove API calls CE->CI See merge request !1307
2015-09-18fix failing migration on mysqlHannes Rosenögger
We didn't specify that the db user needs the right to create temporary tables before. That's why the migration will fail on most installations. This commits removes the "TEMPORARY" from the migration and changes the documentation to include the necessary rights for the future.
2015-09-18Fix gitlab ci projects page UIDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-18Add colors to build labelsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-18Merge branch 'master' into ci-build-listDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-18Merge branch 'fix-doc-typo' into 'master' Robert Speicher
Fix typo in Reply by email docs See merge request !1346
2015-09-18remove API calls from CE to CIValery Sizov
2015-09-18Merge branch 'merge_request_error' into 'master' Dmitriy Zaporozhets
Fix CI status in the MR page https://gitlab.com/gitlab-org/gitlab-ce/issues/2587 See merge request !1347
2015-09-18Fix CI status in the MR pageValery Sizov
2015-09-18Merge branch 'pg_dump_schema' into 'master' Dmitriy Zaporozhets
Add pg_schema to backup config https://dev.gitlab.org/gitlab/gitlabhq/issues/2489 See merge request !1345
2015-09-18add pg_schema to backup configValery Sizov
2015-09-18Merge branch 'allow-to-disable-ci' into 'master' Dmitriy Zaporozhets
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
2015-09-18Fix typo in Reply by email docsDouwe Maan
2015-09-18Use 400 to notify that CI API is disabledKamil Trzcinski
2015-09-18Allow to disable GitLab CIKamil Trzcinski
2015-09-18Merge branch 'add-custom-text-to-help' into 'master' Jeroen van Baarsen
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
2015-09-18Merge branch 'fix-ci-non-public-project' into 'master' Dmitriy Zaporozhets
Fix 500 when accessing private project when not logged in See merge request !1336
2015-09-18Merge branch 'fix-trending-projects' into 'master' Dmitriy Zaporozhets
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
2015-09-18Merge branch 'fix-ci-settings-cancel' into 'master' Dmitriy Zaporozhets
Remove Cancel button from CI Project settings Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/2568 See merge request !1337
2015-09-18Merge branch 'project-header-titles' into 'master' Dmitriy Zaporozhets
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
2015-09-18Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets
2015-09-18Merge branch 'ci_projects_order' into 'master' Valery Sizov
Fix: ci projects order https://gitlab.com/gitlab-org/gitlab-ce/issues/2553 See merge request !1333
2015-09-18Merge branch 'master' into project-header-titlesDouwe Maan
2015-09-18Fix 500 on trending projects if isntance has 100k+ projectsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-18Allow custom info to be added to Help pageJeroen van Baarsen
Fixes #2536 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-13 17:09:42 +0300