home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,038 Commits 48 Branches 340 Tags
e0823d189f54ab10244afb8efb8aae22fa2dbbdf
Commit Graph
19038 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Vosmaer e0823d189f Relax CI version check during import 2015-09-21 11:46:12 +02:00
Jacob Vosmaer 25c7467ce1 Make importing builds less noisy 2015-09-21 11:42:59 +02:00
Dmitriy Zaporozhets 2460d290af Merge branch 'sh-fix-issue-2585' into 'master' 
Make Markdown area formatting consistent

Issue #2585 


See merge request !1354
 2015-09-21 08:57:51 +00:00
Marin Jankovski f9befb2ab8 Merge branch 'ci-migrate-version-fix' into 'master' 
Use GitlabCi::VERSION when checking migration



See merge request !1368
 2015-09-21 08:36:08 +00:00
Kamil Trzcinski ee0f1c00b1 Use GitlabCi::VERSION when checking migration 2015-09-21 10:33:35 +02:00
Marin Jankovski d2c90d7494 Merge branch 'optimize-ci-tags-migration' into 'master' 
CI migration rake task for GitLab CE

- Uses backup format for final GitLab CI 8.0
- Highly optimized tags migration SQL queries


See merge request !1365
 2015-09-21 08:26:06 +00:00
Kamil Trzcinski a37e591e74 Use INSERT INTO to insert tags 2015-09-21 10:07:53 +02:00
Dmitriy Zaporozhets 8bb3215d54 Merge branch 'fail-ci-builds-without-yml' into 'master' 
Fail ci builds without yml

Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/2551

See merge request !1349
 2015-09-21 07:49:18 +00:00
Douwe Maan 46173ec8ce Merge branch 'fix-markdown-links-in-dashboard' into 'master' 
Fix Markdown links not showing up in dashboard activity feed

Closes #2586

See merge request !1353
 2015-09-21 07:24:19 +00:00
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
Kamil Trzcinski b2a9021685 Change wording 2015-09-21 00:42:25 +02:00
Kamil Trzcinski 098c198271 Disable CI for time of migration 2015-09-21 00:14:07 +02:00
Kamil Trzcinski 500e277a83 Change notices during migrating 2015-09-21 00:13:58 +02:00
Kamil Trzcinski 265ad515c6 Create CI migration task on GitLab side 2015-09-20 23:20:51 +02:00
Kamil Trzcinski 45a105b127 Use pure SQL queries to migrate CI tags 2015-09-20 22:13:47 +02: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 Trzcinski 8671343b65 Rubocop fix 2015-09-20 20:46:15 +02:00
Kamil Trzcinski 71a5d5a036 Fail builds if no .gitlab-ci.yml is found 2015-09-20 20:46:14 +02: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
Stan Hu 3b39b648d2 Fix Markdown links not showing up in dashboard activity feed 
Closes #2586
 2015-09-20 09:32:35 -07: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
Stan Hu 52eac60405 Make Markdown area formatting consistent 2015-09-18 11:33:16 -07: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