Commit Graph
19737 Commits
Author SHA1 Message Date
Dirceu Pereira Tiegs d7bcfe4fc0 Fix issue #3055 (project search with unmatched parentheses) 2015-10-21 10:20:40 -02:00
Robert Speicher 976400c1e6 Merge branch 'incoming-email-config' into 'master'
Make Reply by email easier to configure

Builds on !1566.

Omnibus companion MR: gitlab-org/omnibus-gitlab!510 (cc @marin)

See merge request !1580
2015-10-14 20:38:36 +00:00
Robert Speicher 459b882131 Shut up, Rubocop
[ci skip]
2015-10-14 16:31:54 -04:00
Robert Speicher 123669a551 Merge branch 'simplify-cross-references' into 'master'
Simplify code around (cross)-references

See merge request !1568
2015-10-14 20:10:34 +00:00
Kamil Trzciński a3a80eac11 Merge branch 'show_pending_warning' into 'master'
Show warning when build is pending and there are not runners

This change is based on: !1530.

This resolves #2967.



See merge request !1573
2015-10-14 18:57:05 +00:00
Kamil Trzciński 45c0b74dc4 Merge branch 'predefined_build_variables' into 'master'
Add a few predefined variables to CI builds

This adds CI_BUILD_TAG, CI_BUILD_STAGE, CI_BUILD_NAME and CI_BUILD_TRIGGERED to build environment.

This change is based on: !1530 

See merge request !1572
2015-10-14 18:55:59 +00:00
Valery Sizov 0b9273a283 Merge branch 'uploads_path_fix' into 'master'
Fix: Images cannot show when projects' path was changed

Fixes #1443

See merge request !1521
2015-10-14 18:02:23 +00:00
Valery Sizov ffb99edc26 Merge branch 'revert_service_passwd' into 'master'
Revert "Improve invalidation of stored service password if the endpoint URL is changed"

This reverts commit b463975480.

See merge request !1595
2015-10-14 17:48:41 +00:00
Valery Sizov b83a18a55c Revert "Improve invalidation of stored service password if the endpoint URL is changed"
This reverts commit b463975480.
2015-10-14 19:21:27 +03:00
Valery Sizov 2fb02f9252 Merge branch 'fix/improve_reset_service_password' into 'master'
Improve invalidation of stored service password if the endpoint URL is changed

A number of issues were found in !1490 and !1558 (triggered by support request 7395)

* It is not possible to set a new URL and a password at the same time (new password is ignored)
* An error occurs on the Service Templates admin pages (prop_updated? was referencing the service's project, which is not defined for templates)
* Passwords are reset on every save in Service Templates admin pages

This should fix these 3 issues by respectively:
* Differentiating a property that has been assigned a new value (regardless of the new value) and a property that has been assigned a new value that is different from the old one
* Providing an alternate implementation to detected updated properties, not relying on the service's project
* Filtering an empty password parameter passed to the Service Templates admin page like on the project service page

See merge request !1583
2015-10-14 16:01:35 +00:00
Valery Sizov 8f584d5f2c Fix: Images cannot show when projects' path was changed 2015-10-14 18:50:35 +03:00
Valery Sizov a2f0a3650b Merge remote-tracking branch 'origin/cernvcs_hide_passwrd' 2015-10-14 18:40:58 +03:00
Kamil Trzcinski d9e2232f63 Fix warning sign 2015-10-14 17:29:18 +02:00
Kamil Trzcinski 16bfd9d31a Fix specs 2015-10-14 17:29:18 +02:00
Kamil Trzcinski 7af4f5215e Show warning if build doesn't have runners with specified tags or runners didn't connect recently
Slightly refactor runner status detection: moving it to Runner class

Signed-off-by: Kamil Trzcinski <ayufan@ayufan.eu>
2015-10-14 17:29:18 +02:00
Kamil Trzcinski 5807419519 Use tag? instead of tag to indicate that this is boolean 2015-10-14 17:28:17 +02:00
Kamil Trzcinski 7b5ab3ded5 Added CI_BUILD_TAG, _STAGE, _NAME and _TRIGGERED to CI builds 2015-10-14 17:28:17 +02:00
Kamil Trzcinski 2d0fcb4de2 Fix spinach tests introduced by 07101cfab6 2015-10-14 17:27:29 +02:00
Valery Sizov 6c1faf4b33 Merge remote-tracking branch 'origin/inified_404_error' 2015-10-14 18:21:27 +03:00
Kamil Trzciński 3b93d37e78 Merge branch 'fix-retry-and-cancel' into 'master'
Fix retry and cancel for build

This fixes some regressions introduced by Commit Status API

See merge request !1586
2015-10-14 13:40:33 +00:00
Alex Lossent b463975480 Improve invalidation of stored service password if the endpoint URL is changed
It now allows to specify a password at the same time as the new URL, and works
on the service template admin pages.
2015-10-14 15:27:59 +02:00
Douwe Maan 07101cfab6 Merge branch 'fix_issue_2906' into 'master'
+ and Titleize New Project button on dashboard

Hello there. Its my first merge request in open source world. So please be tolerant to me if i do something wrong.

I try to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/2906

See merge request !1564
2015-10-14 12:14:31 +00:00
Valery Sizov 4117d9b310 Merge branch 'feature/api_hide_service_password' of gitlab.com:cernvcs/gitlab-ce 2015-10-14 14:15:34 +03:00
Kamil Trzcinski 33c9d6e45c Fix retry and cancel for build 2015-10-14 12:56:52 +02:00
Douwe Maan 276b3a7bc2 Make Mentionable#cross_reference_exists? private. 2015-10-14 09:27:39 +02:00
Douwe Maan 613aa1cb87 Add defaults for incoming_email ssl and start_tls. 2015-10-14 07:21:15 +00:00
Robert Speicher 530f0d71f5 Shut up, Rubocop 2015-10-14 01:07:58 -04:00
Robert Speicher 82da19cecd Merge branch 'mailroom-arbitration' into 'master'
Enable arbitration in MailRoom

Fixes #2870.

See merge request !1566
2015-10-13 22:26:05 +00:00
Dmitriy Zaporozhets 52983a84b9 Merge branch 'stanhu/gitlab-ce-wiki-add-new-page-in-pages-tab' 2015-10-13 20:32:06 +02:00
Dmitriy Zaporozhets 1a57fbc437 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-10-13 20:31:11 +02:00
Dmitriy Zaporozhets 989928eca3 Merge branch 'gfm-commit-size' 2015-10-13 20:30:57 +02:00
Stan Hu ea2008df93 Merge pull request #9723 from sue445/tweak_api_doc
Tweak api doc
2015-10-13 10:17:23 -07:00
Stan Hu e0072892e8 Merge branch 'add-wip-to-mr-hook-attrs' into 'master'
merge_request: add work_in_progress to MR hooks



See merge request !1443
2015-10-13 17:12:51 +00:00
Valery Sizov 8346dde052 Only render 404 page from /public 2015-10-13 20:12:34 +03:00
Douwe Maan 135ec3242d Reduce font size of commit references to not stand out as much 2015-10-13 18:41:29 +02:00
Dmitriy Zaporozhets c9c538469c Merge branch 'redesign-files-page' 2015-10-13 17:48:46 +02:00
sue445 2297a7ba1f [ci skip] Add missing parameters in API doc 2015-10-14 00:45:11 +09:00
sue445 a092d27025 [ci skip] Fix wrong comment
According to `attributes_for_keys` and API doc, `POST /projects/:id/merge_requests`
is received `target_project_id` (NOT `target_project`)
2015-10-14 00:36:54 +09:00
Dmitriy Zaporozhets 1907f25944 Merge branch 'group_names_widget' into 'master'
Project names are not fully shown if group name is too big, even on group page view

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


![joxi_screenshot_1444408109183](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c21ae245254b82db0212298b6f997067/joxi_screenshot_1444408109183.png)


See merge request !1561
2015-10-13 15:20:05 +00:00
Dmitriy Zaporozhets a0a488ed13 Apply new design to files page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-13 16:41:48 +02:00
Kamil Trzciński e3edd53ae4 Merge branch 'commit_status' into 'master'
Implement Commit Status API

This is preliminary implementation of Commit Status API, pretty much compatible with GitHub.

1. The Commit Statuses are stored in separate table: ci_commit_status.
2. The POST inserts a new row.
3. To POST execute GitLab API `post :id/repository/commits/:sha/status`. This accepts dual authorization:
- Using authorized user
- Using ci-token to allow easy posting from CI Services
4. This adds predefined variable to GitLab CI build environment: CI_BUILD_STATUS_URL, allowing to easy post status from within build (ex. with code coverage or other metrics).
5. This adds statuses to commit's builds view.
6. The commit's status is calculated taking into account status of all builds and all posted statuses.
7. The commit statuses doesn't trigger notifications.
8. The commit status API introduces two new privileges: `read_commit_statuses` and `create_commit_status`.
9. We still miss a few tests and documentation updates for API and CI.

@dzaporozhets @sytses What do you think?




See merge request !1530
2015-10-13 14:33:00 +00:00
Dmitriy Zaporozhets 5313c38858 Merge branch 'css-cleanup' into 'master'
Small css cleanup

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

cc @skyruler 

See merge request !1582
2015-10-13 13:44:16 +00:00
Dmitriy Zaporozhets 2f68fb9cc3 Small css cleanup
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-13 14:52:20 +02:00
Dmitriy Zaporozhets c28d4c378b Merge branch 'ui-improvements' into 'master'
Ui improvements

* fix dashboard projects page for mobile
* fix project home page for mobile
* remove gray padding for small screens
* render no-ssh message same like we do for flash messages

cc @skyruler 

See merge request !1581
2015-10-13 12:39:13 +00:00
Dmitriy Zaporozhets e75655950d Several fixes for UI on mobile
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-13 13:37:15 +02:00
Douwe Maan 712d17684b Make Reply by email easier to configure 2015-10-13 13:10:49 +02:00
Dmitriy Zaporozhets 219451241a Fix UI issue on project page with no ssh key message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-13 13:03:27 +02:00
Dmitriy Zaporozhets 4ad61519f9 Fix control buttons in lists
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-13 13:02:27 +02:00
Dmitriy Zaporozhets b3aebbbdb3 Merge branch 'refactor-styles' into 'master'
Refactor styles

cc @skyruler 

See merge request !1577
2015-10-13 10:03:39 +00:00
Kamil Trzcinski e7cc554cc1 Fix retry and cancel URLs 2015-10-13 11:51:08 +02:00