Dmitriy Zaporozhets
8ae026a6e6
Merge branch 'fix-ci-permissions' into 'master'
...
Fix CI permissions
This fixes two problems:
- Allow developers to retry builds
- Hide advanced project options from CI page for non-admin users
See merge request !1379
2015-09-22 07:54:11 +00:00
Stan Hu
0346e9724a
Tweak remaining CSS for Markdown preview
...
Missed a few items in !1378
2015-09-21 14:08:26 -07:00
Robert Speicher
ba71542a5a
Merge branch 'fix-issue-2593' into 'master'
...
Fix Error 500 when comparing non-existing branches
Closes #2593
See merge request !1355
2015-09-21 20:46:15 +00:00
Robert Speicher
d4a960161e
Merge branch 'rename-reply-by-email' into 'master'
...
Rename reply_by_email to incoming_email to prepare for the future.
Closes #2579 .
See merge request !1367
2015-09-21 18:52:13 +00:00
Dmitriy Zaporozhets
cbdee053b4
Merge branch 'fix-ci-handling' into 'master'
...
Fixed MR handling when GitLab CI project is not present
This is copy of !1371
/cc @jacobvosmaer @vsizov @dzaporozhets
See merge request !1373
2015-09-21 18:29:29 +00:00
Kamil Trzcinski
68cdeb71d5
Fix permissions problems
...
- Allow developers to retry builds
- Hide advanced project options from CI page for non-admin users
2015-09-21 20:28:56 +02:00
Robert Speicher
cacc70daf4
Merge branch 'fix-note-edit-preview-css' into 'master'
...
More tweaks to make note edit/preview CSS consistent
Closes #2585
See merge request !1378
2015-09-21 18:18:55 +00:00
Dmitriy Zaporozhets
cc851b04c0
Merge branch 'fix-mr-without-refs' into 'master'
...
Fetch merge request ref if it is missing when visit MR page
This will fix merge problem for merge requests between forks created
before 8.0
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Needed for 8.0
Fixes #2580
See merge request !1377
2015-09-21 17:13:29 +00:00
Stan Hu
ef2fb20135
More tweaks to make note edit/preview CSS consistent
...
Closes #2585
2015-09-21 10:11:58 -07:00
Dmitriy Zaporozhets
e0a23791d3
Merge branch 'fix-milestone-destroy-in-mr' into 'master'
...
Remove milestones from merge requests when milestones are deleted
Destroying a milestone does not remove it from existing merge requests. This MR fixes that.
Requires f4816372https://github.com/gitlabhq/gitlabhq/issues/9643
See merge request !1348
2015-09-21 16:21:12 +00:00
Dmitriy Zaporozhets
39ed04c7b5
Merge branch 'repo-size-link' into 'master'
...
Link project repo size to files
See merge request !1374
2015-09-21 15:24:26 +00:00
Dmitriy Zaporozhets
ea64ba1fe3
Merge branch 'remove-project-panel-ci-button' into 'master'
...
Remove CI button from project home panel
Since we already have a "Continuous Integration" item in the sidebar now, I don't think we need "CI" on the project page.
See merge request !1372
2015-09-21 14:44:52 +00:00
Dmitriy Zaporozhets
de729a1e9c
Merge branch 'ci-nav-fw' into 'master'
...
Use fixed-width icons in CI nav sidebar.
See merge request !1376
2015-09-21 14:41:56 +00:00
Dmitriy Zaporozhets
3a001a9290
Fetch merge request ref if it is missing when visit MR page
...
This will fix merge problem for merge requests between forks created
before 8.0
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-21 16:25:59 +02:00
Stan Hu
ea5c25bb4e
Remove milestones from merge requests when milestones are deleted
...
Reported by https://github.com/gitlabhq/gitlabhq/issues/9643
2015-09-21 07:00:55 -07:00
Douwe Maan
09e0f8abb4
Use fixed-width icons in CI nav sidebar.
2015-09-21 15:04:30 +02:00
Douwe Maan
f935259260
Use consistent styling for number of commits in CI nav sidebar
2015-09-21 14:59:50 +02:00
Douwe Maan
a9d686b2fb
Link project repo size to files
2015-09-21 14:57:33 +02:00
Kamil Trzcinski
ca6fd0a27d
Fixed MR handling when GitLab CI project is not present
2015-09-21 14:55:02 +02:00
Douwe Maan
82edd68e55
Remove CI button from project home panel
2015-09-21 14:53:58 +02:00
Kamil Trzcinski
abaa65efc1
Revert "Fixed MR handling when GitLab CI project is not present"
...
This reverts commit 3abcab779e
2015-09-21 14:52:51 +02:00
Kamil Trzcinski
3abcab779e
Fixed MR handling when GitLab CI project is not present
2015-09-21 13:53:03 +02:00
Douwe Maan
183892fde9
Merge branch 'notification-levels' into 'master'
...
Notification levels can now be set on the Project's main page
The notification settings for a project can now be set directly on the Project's page. The drop down list and the button label reflect the current level.
Saving is done via a remote form submission and if successful shows the user a flash message:
@DouweM can you please review my code. I gave my bestest effort to make in clean and readable.
@rspeicher hopefully we can include it with the 8.0 release, maybe?
/cc @darby
See merge request !1322
2015-09-21 09:19:32 +00: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
Douwe Maan
0c83349867
Merge branch 'master' into rename-reply-by-email
2015-09-21 10:35:56 +02:00
Douwe Maan
ee028d9d60
Rename reply_by_email to incoming_email to prepare for the future.
2015-09-21 10:35:37 +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
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
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
Douwe Maan
47e926bec0
Minor code cleanup
2015-09-20 19:09:43 +02: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
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
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
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
de8497ca56
Fix Error 500 when comparing non-existing branches
...
Closes #2593
2015-09-18 12:02:01 -07:00
Dmitriy Zaporozhets
Stan Hu
Robert Speicher
Kamil Trzcinski
Douwe Maan
Marin Jankovski
Robert Speicher
Kirilll Zaitsev
