home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-14 15:16:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,020 Commits 48 Branches 340 Tags
ca45e925dfcf5b67fd494bd2009ca7ed0447dacc
Commit Graph
19020 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Speicher ca45e925df Merge branch 'reply-by-email-diff' into 'master' 
Fix reply by email for comments on a specific line in a diff/commit.

Fixes #2363.

See merge request !1364
 2015-09-21 00:51:53 +00:00
Job van der Voort 26544eabe7 Merge branch 'gmail_actions_doc' into 'master' 
Add Gmail actions button for GitLab doc.

Resolves #1517 by adding doc with some notes.

See merge request !1327
 2015-09-20 19:45:57 +00:00
Kamil Trzciński a6f2caf7a2 Merge branch 'fix-ci-link-on-project-page' into 'master' 
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-20 18:44:48 +00:00
Douwe Maan 3377808193 Fix reply by email for comments on a specific line in a diff/commit. 2015-09-20 18:18:39 +02:00
Dmitriy Zaporozhets 11bbc06b4b Merge branch 'style-pagination' into 'master' 
Apply new design to pagination

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @skyruler 

See merge request !1362
 2015-09-20 15:43:49 +00:00
Dmitriy Zaporozhets 0b3f563b33 Merge branch 'ci-build-list' into 'master' 
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-20 15:41:24 +00:00
Douwe Maan 9be1c08e5d Merge branch 'jwt' into 'master' 
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-20 15:19:33 +00:00
Douwe Maan 2c0704fabc Merge branch 'rs-bump-two-factor' into 'master' 
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-20 15:07:58 +00:00
Robert Schilling d622df0bf8 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-09-20 09:41:14 +02:00
Robert Schilling a26680acdf Merge pull request #9646 from sameersbn/fix-link-to-docs 
fixes link to reply_by_email docs
 2015-09-20 09:18:09 +02:00
Sameer Naik 01c0d14e41 fixes link to reply_by_email docs 2015-09-20 11:25:09 +05:30
Robert Speicher 259851c0d6 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
 2015-09-19 21:16:18 -04:00
Robert Speicher 69723d2002 Devise 3.5.x deprecates confirm! in favor of confirm 2015-09-19 21:15:13 -04:00
Robert Speicher ce8f78a571 Bump devise to 3.5.2 2015-09-19 21:12:32 -04:00
Robert Speicher 96790b1aac Merge branch 'fix-failing-migration' into 'master' 
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-19 21:07:43 +00:00
Dmitriy Zaporozhets 9fb3ef8888 Apply new design to pagination 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-19 16:22:04 +02:00
Kirilll Zaitsev 9021200ad3 Removed format validation 2015-09-19 14:12:20 +03:00
Dmitriy Zaporozhets 4daffbe406 Cleanup GitLab CI UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-19 01:40:44 +02:00
Dmitriy Zaporozhets 34da6f00f6 Return callout css for CI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-19 00:21:24 +02:00
Dmitriy Zaporozhets 442db0801a Merge branch 'master' into ci-build-list 2015-09-19 00:15:49 +02:00
Robert Speicher 5a8d73243a Merge branch 'rs-issue-2597' into 'master' 
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-18 21:17:18 +00:00
Robert Speicher 68b15af46c Fix IssuableContext javascript 
We were calling `affix` before the events were bound so they never
triggered correctly.

Closes #2597
 2015-09-18 16:35:38 -04:00
Kamil Trzcinski a19a0b431c Fix 500 when showing project page and there's no CI project present 2015-09-18 21:54:00 +02:00
Kamil Trzciński dfa32123e3 Merge branch 'ci_closer_integration' into 'master' 
Remove API calls CE->CI



See merge request !1307
 2015-09-18 19:50:20 +00:00
Hannes Rosenögger a22b6c591f 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.
This commits removes the "TEMPORARY" from the migration
and changes the documentation to include the necessary rights for the future.
 2015-09-18 19:49:04 +02:00
Dmitriy Zaporozhets b2c06bf707 Fix gitlab ci projects page UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-18 18:32:09 +02:00
Dmitriy Zaporozhets 6776dcf90b Add colors to build labels 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-18 18:24:33 +02:00
Dmitriy Zaporozhets 2122d7b919 Merge branch 'master' into ci-build-list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-18 18:24:08 +02:00
Robert Speicher 2cb88a8a36 Merge branch 'fix-doc-typo' into 'master' 
Fix typo in Reply by email docs

See merge request !1346
 2015-09-18 16:14:08 +00:00
Valery SizovandKamil Trzcinski a0c1a12dee remove API calls from CE to CI 2015-09-18 18:02:11 +02:00
Dmitriy Zaporozhets bdfe6b9603 Merge branch 'merge_request_error' into 'master' 
Fix CI status in the MR page

https://gitlab.com/gitlab-org/gitlab-ce/issues/2587

See merge request !1347
 2015-09-18 15:57:17 +00:00
Valery Sizov 600d6eeff3 Fix CI status in the MR page 2015-09-18 18:02:29 +03:00
Dmitriy Zaporozhets ac571623d8 Merge branch 'pg_dump_schema' into 'master' 
Add pg_schema to backup config

https://dev.gitlab.org/gitlab/gitlabhq/issues/2489

See merge request !1345
 2015-09-18 14:33:35 +00:00
Valery Sizov d7242054ba add pg_schema to backup config 2015-09-18 16:29:13 +03:00
Dmitriy Zaporozhets 8b05abe816 Merge branch 'allow-to-disable-ci' into 'master' 
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-18 12:50:25 +00:00
Douwe Maan 87db46e2d8 Fix typo in Reply by email docs 2015-09-18 12:11:49 +00:00
Kamil Trzcinski 97fa990406 Use 400 to notify that CI API is disabled 2015-09-18 12:46:47 +02:00
Kamil Trzcinski e41a29b0c3 Allow to disable GitLab CI 2015-09-18 12:46:47 +02:00
Jeroen van Baarsen 1eb3dde45b Merge branch 'add-custom-text-to-help' into 'master' 
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-18 09:24:15 +00:00
Dmitriy Zaporozhets d272682a15 Merge branch 'fix-ci-non-public-project' into 'master' 
Fix 500 when accessing private project when not logged in



See merge request !1336
 2015-09-18 09:18:49 +00:00
Dmitriy Zaporozhets f2608c41b8 Merge branch 'fix-trending-projects' into 'master' 
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-18 09:18:12 +00:00
Dmitriy Zaporozhets db74db6eb6 Merge branch 'fix-ci-settings-cancel' into 'master' 
Remove Cancel button from CI Project settings

Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/2568

See merge request !1337
 2015-09-18 09:15:23 +00:00
Dmitriy Zaporozhets f937ac867d Merge branch 'project-header-titles' into 'master' 
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-18 09:11:18 +00:00
Dmitriy Zaporozhets e9a5680998 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-09-18 10:55:13 +02:00
Valery Sizov 3984818bb3 Merge branch 'ci_projects_order' into 'master' 
Fix: ci projects order

https://gitlab.com/gitlab-org/gitlab-ce/issues/2553

See merge request !1333
 2015-09-18 08:54:06 +00:00
Douwe Maan 5faa6e75d0 Merge branch 'master' into project-header-titles 2015-09-18 10:48:06 +02:00
Dmitriy Zaporozhets b6de7ad49e Fix 500 on trending projects if isntance has 100k+ projects 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-18 10:45:42 +02:00
Jeroen van Baarsen fe17a236e3 Allow custom info to be added to Help page 
Fixes #2536

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-09-18 10:15:40 +02:00
Dmitriy Zaporozhets e86668984f Style CI project/build list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-18 09:44:10 +02:00
Kamil Trzcinski b53994bb9e Remove Cancel button in Project settings 2015-09-17 23:33:21 +02:00