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
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
Kamil Trzcinski
ca6fd0a27d
Fixed MR handling when GitLab CI project is not present
2015-09-21 14:55:02 +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
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
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
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
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
3377808193
Fix reply by email for comments on a specific line in a diff/commit.
2015-09-20 18:18:39 +02:00
Kirilll Zaitsev
9021200ad3
Removed format validation
2015-09-19 14:12:20 +03: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
Valery Sizov and Kamil 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
Kamil Trzcinski
e41a29b0c3
Allow to disable GitLab CI
2015-09-18 12:46:47 +02:00
Stan Hu
b75e4d7149
Merge pull request #9618 from pjknkda/repo-info-to-issue-hook
...
add repository field to issue hook data
2015-09-17 07:03:47 -07:00
Stan Hu
f481637245
Merge branch 'fix-issue-2382' into 'master'
...
Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity
Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone".
Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed:
Closes #2382
See merge request !1227
2015-09-17 08:04:37 +00:00
Valery Sizov and Valery Sizov
ce4defaf2f
enable SSL by default
2015-09-17 09:51:24 +03:00
Patricio Cano
1ddefa3bea
Merge branch 'master' into notification-levels
2015-09-16 19:54:18 -05:00
Patricio Cano
1ef2ce95d5
Merge branch 'master' into notification-levels
2015-09-16 19:52:57 -05:00
Patricio Cano
4c98357f16
Added Global to the drop downs and updated the label of the button to show the current level instead of Notifications
2015-09-16 19:46:24 -05:00
Jungkook Park
e4ac2d582c
add repository field to issue hook data
...
add a test for to_hook_data of issue model
update CHANGELOG
2015-09-17 05:33:37 +09:00
Dmitriy Zaporozhets
a0aa6453bd
Merge branch 'add-links-to-ci' into 'master'
...
Add links from GitLab to CI
* link from dashboard to CI dashboard
* link from project to CI project
Its a fast solution for 8.0. Might be improved in later versions
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
See merge request !1313
2015-09-16 16:26:41 +00:00
Dmitriy Zaporozhets
f9dc3a2fb5
Add links from GitLab to CI
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-09-16 17:54:38 +02:00
Kamil Trzcinski
7ea48ec546
Fix CI tests
2015-09-16 17:20:00 +02:00
Kamil Trzcinski
912f470497
Fix ordering issue
2015-09-16 16:59:54 +02:00
Kamil Trzcinski
e21deaee8e
Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
...
# Conflicts:
# Gemfile.lock
2015-09-15 22:40:35 +02:00
Kamil Trzcinski
fe42de3a48
Fix: features/ci/admin/runners_spec.rb
2015-09-15 22:15:28 +02:00
Kamil Trzcinski
5285e01d54
Fix: features/ci/runners_spec.rb
2015-09-15 21:21:46 +02:00
Jeroen van Baarsen
34e1ce130f
Add a help text to the Slack Service
...
When setting up the service I was not sure which webhook I should use, by adding
this Help text I hope we can help people in the future with setting up this hook
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com >
2015-09-15 20:46:11 +02:00
Valery Sizov
b87ca7500f
fix specs. Stage 7
2015-09-15 17:43:17 +03:00
Stan Hu
d3d03d1362
Create a "destroyed Milestone" event and keep Milestone events around in the DB
...
for posterity.
Also fix issue where destroying a Milestone would cause odd, transient messages like
"created milestone" or "imported milestone".
Add "in" preposition when creating and destroying milestones
Closes #2382
2015-09-15 05:51:11 -07:00
Patricio Cano
adcae6ebd5
Notification level can now be saved from within the project view.
2015-09-14 19:27:54 -05:00
Dmitriy Zaporozhets
2ed2ef9210
Remove network from CI
2015-09-11 13:38:37 +02:00
Dmitriy Zaporozhets
a8dd4d36e2
Fix build features specs
2015-09-11 12:52:56 +02:00
Stan Hu
9995f0806b
Import forked repositories asynchronously to prevent large repositories from timing out
...
Use import_status to track async import status and give feedback to the user
Closes #2388
Closes #2400
2015-09-11 00:34:04 -07:00
Valery Sizov
6db2843bc2
fix of project creation
2015-09-10 17:54:09 +03:00
Dmitriy Zaporozhets
59c3a3239f
Fix commit specs
2015-09-10 15:52:52 +02:00
Dmitriy Zaporozhets
10b3c85e2c
Fix some issues with ci models specs
2015-09-10 15:47:15 +02:00
Valery Sizov
381180bc27
remove gitlab_ci config
2015-09-10 13:42:41 +03:00
Valery Sizov
44261a5d9f
integration with gitlab auth
2015-09-09 17:36:01 +03:00
Dmitriy Zaporozhets
fefa98b21a
Make rspec start
2015-09-09 15:08:01 +02:00
Dmitriy Zaporozhets
0b5d627cd4
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-09-09 14:56:02 +02:00
Dmitriy Zaporozhets
b05cc8bc9a
Merge branch 'global_labels' into 'master'
...
Global labels
https://dev.gitlab.org/gitlab/gitlabhq/issues/2353
See merge request !1240
2015-09-09 08:57:54 +00:00
Jared Szechy
e156f42079
FogBugz project import
2015-09-08 20:23:01 -04:00
Robert Speicher
Dmitriy Zaporozhets
Kamil Trzcinski
Douwe Maan
Kirilll Zaitsev
Valery SizovandKamil Trzcinski
Stan Hu
Valery SizovandValery Sizov
Patricio Cano
Jungkook Park
Jeroen van Baarsen
Jared Szechy
