9621f433a7
Fix: features/ci/projects_spec.rb
2015-09-15 21:06:12 +02:00
a598bd91f9
Refactor ci_admin_event and fix features/ci/events_spec.rb
2015-09-15 20:56:20 +02:00
6d0980b011
Fix: ci_*_build factory should be valid
2015-09-15 20:51:03 +02:00
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
8549d709fb
Fix ci/projects_controller_spec.rb
2015-09-15 20:40:52 +02:00
269b9224cf
Use GitLab instead of GITLAB for rake task
2015-09-15 20:14:22 +02:00
7e07bc0698
Remove unused tasks
2015-09-15 20:14:22 +02:00
ed18e04bb3
Cleanup CI backup => migrate with GitLab
2015-09-15 20:14:21 +02:00
bc10a48c97
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-09-15 13:50:28 -04:00
238365175f
Merge branch 'rs-update-guide' into 'master'
...
Reorder the `--without` arugments so the database comes first
Hopefully this will make it a bit clearer that we're excluding a certain
database type.
[ci skip]
See merge request !1301
2015-09-15 17:43:46 +00:00
f01aaba778
Reorder the `--without` arugments so the database comes first
...
Hopefully this will make it a bit clearer that we're excluding a certain
database type.
[ci skip]
2015-09-15 13:41:29 -04:00
77e499ed1c
Merge branch 'rs-update-guide' into 'master'
...
Minor editing of the 7.14-to-8.0 update guide
[ci skip]
See merge request !1300
2015-09-15 17:28:00 +00:00
d420b608e6
Minor editing of the 7.14-to-8.0 update guide
2015-09-15 13:24:38 -04:00
c12590591f
Merge pull request #9630 from fscherwi/patch-1
...
change coverage image to svg [ci skip]
2015-09-15 19:14:11 +02:00
b9cc41cf34
change coverage image to svg [ci skip]
2015-09-15 18:07:28 +02:00
d9d50c0598
Merge branch 'fix_empty_project' into 'master'
...
Fix empty project UI
In an empty project, the 'project is empty' light well was mashed up against the project panel. The light well have 16px margin so there was some white space along the edges that looked funny. This MR makes the 'project is empty' text block a `gray-content-area` which fits nicely with the rest of the UI.
**Current:**
**As proposed:**
See merge request !1291
2015-09-15 16:07:22 +00:00
dad9de660c
Merge branch 'import-in-progress-fix' into 'master'
...
Don't display "git clone --bare <URL>" if no URL is available
Make it clear that forking is different than importing. Forked repositories don't use `import_url`, so only display if is available. Introduced in !1231
Before:
After:
See merge request !1295
2015-09-15 16:04:20 +00:00
b87ca7500f
fix specs. Stage 7
2015-09-15 17:43:17 +03:00
0ecc57fe50
Merge branch 'update-gitlab-emoji' into 'master'
...
Update gitlab_emoji to 0.1.1
See merge request !1290
2015-09-15 13:47:43 +00:00
2abe733866
Display "Forking in Progress" when importing a forked project
2015-09-15 06:45:03 -07:00
4d2b67acc0
Don't display "git clone --bare <URL>" if no URL is available
...
Introduced in !1231
2015-09-15 06:39:37 -07:00
88b3195ecf
fix specs. Stage 6
2015-09-15 16:29:36 +03:00
e2cbb36ba9
fix specs. Stage 5
2015-09-15 15:51:03 +03:00
16ba41a186
fix specs. Stage 4
2015-09-15 14:45:59 +03:00
3315e89df6
Merge branch 'ui-fixes' into 'master'
...
Improve UI for last push widget and web editor
See merge request !1296
2015-09-15 11:11:18 +00:00
22bf844869
fix specs. Stage 3
2015-09-15 13:50:24 +03:00
080a086d76
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2015-09-15 11:47:30 +02:00
dacff8f014
Fix UI for web editor
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-15 11:17:22 +02:00
ff22868b90
Merge branch 'renasem-btn' into 'master'
...
Improve project settings button on profile
Rename `Edit profile settings` to `profile settings` button
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !1932
2015-09-15 09:04:17 +00:00
a635e1a395
Fix last push widget
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-15 11:02:37 +02:00
558084f403
Improve project settings button on profile
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-15 09:54:42 +02:00
81e741af24
Merge pull request #9138 from liyakun/master
...
add "replace" and "upload" functionality
2015-09-14 17:57:41 -07:00
e2ece2bc35
Add "Replace" and "Upload" features
...
Refactor upload and replace functionality
Rename file and move CSS
Fix typo
Make dropzone a div
Remove unnecessary file
Change color of "upload existing one"
Add missing changes
2015-09-15 02:12:56 +02:00
9a3d0f1d92
Add rake task to migrate CI tags
2015-09-15 00:29:20 +02:00
c99473e57c
Merge branch 'header-titles' into 'master'
...
Add page titles to header for group and project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2586
See merge request !1293
2015-09-14 19:00:28 +00:00
ebd06d7e7d
Make small ui fixes for CI
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-14 21:00:06 +02:00
b5c681c0c9
Add current_ref helper method
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-14 20:23:01 +02:00
d3be65a811
Remove repeating titles on members and label pages
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-14 20:08:35 +02:00
0c8f07774c
Add page titles to header for group and project
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-14 19:46:58 +02:00
789d06e48b
Fix empty project UI
2015-09-14 11:20:18 -05:00
0d01008876
Update gitlab_emoji to 0.1.1
2015-09-14 18:10:23 +02:00
b35d5a6a16
Merge branch 'public_profiles' into 'master'
...
Make all group public
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1219#
Internal issue - https://dev.gitlab.org/gitlab/gitlabhq/issues/1361
See merge request !1247
2015-09-14 15:28:42 +00:00
910bf96ec3
fix specs. Stage 2
2015-09-14 18:14:17 +03:00
c0c314c6bf
Merge branch 'forked-repo-creation-async' into 'master'
...
Import forked repositories asynchronously to prevent large repositories from timing out
Preserve synchronous mode of adding a repository since some tasks (e.g. restore/check) require the former.
One side bug fix is that the `ProjectCacheWorker` is also run, updating the repository size and commit numbers properly. Previously all the values were set to 0 when a project were forked.
* Closes #2388
* Closes #2400
See merge request !1231
2015-09-14 14:56:13 +00:00
e72b9ffe98
Merge branch 'fix_tooltips' into 'master'
...
Fix tooltip display in list views
After the recent UI changes the tooltips in a list view rendered behind the next object. This resets the tooltip's container to the body, rather than the individual `issue-info` div. In particular, this change will be applied to *all* tooltips in GitLab. This should take care of any other unidentified issues like this and should not have any negative effects that I can think of. This fixes the bug I noted in !1255 .
**Current:**
**As proposed:**
See merge request !1288
2015-09-14 14:47:19 +00:00
a399fe32e8
Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of gitlab.com:gitlab-org/gitlab-ce into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-09-14 16:49:03 +03:00
2c4daf1a68
fix part of specs
2015-09-14 16:48:33 +03:00
539f30ddcf
Fix tooltip display in list views
2015-09-14 08:45:16 -05:00
3e97de838c
Hide search panel for group page if you dont have access
2015-09-14 15:01:04 +02:00
d3f5df2bba
Merge branch 'add_diff_note_hover_size' into 'master'
...
Keep add-diff-note button the same size on hover. Fixes #2497
Removes the overridden `font-size` and `width` so the button inherits size on hover. See #2497 for screenshots of prior behavior.
See merge request !1285
2015-09-14 12:22:02 +00:00
Kamil Trzcinski
Jeroen van Baarsen
Robert Speicher
Robert Speicher
Robert Schilling
fscherwi
Dmitriy Zaporozhets
Valery Sizov
Marin Jankovski
Stan Hu
Dmitriy Zaporozhets
liyakun
Drew Blessing
Robert Schilling
