home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,925 Commits 48 Branches 340 Tags
b39b156407f5ef1ea483dcd8d628d4835d02b2ff
Commit Graph
9281 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets d906dedec6 Merge branch 'fix-ci-nav' into 'master' 
Fix confusing behaviour of back link in CI sidebar

Back link should always be responsible for sidebar navigation below.
It should change sidebar navigation to one level up

See merge request !1316
 2015-09-16 19:00:02 +00:00
Dmitriy Zaporozhets 6cf554bd3c Merge branch 'style-ci-page' into 'master' 
Style CI projects page and builds list

Partly implements #2545

See merge request !1315
 2015-09-16 18:57:35 +00:00
Dmitriy Zaporozhets f7365ae33e Merge branch 'fix-issue-2555' into 'master' 
Fix default avatars to ensure that helpers don't have /assets dir appended

See issue #2555

See merge request !1314
 2015-09-16 18:40:18 +00:00
Dmitriy Zaporozhets 9437f0618a Fix confusing behaviour of back link in CI sidebar 
Back link should always be responsible for sidebar navigation below.
It should change sidebar navigation to one level up
 2015-09-16 20:16:44 +02:00
Stan Hu 1dc04bf6b7 Eliminate combined image_tag and image_path in providers list 2015-09-16 11:04:09 -07:00
Dmitriy Zaporozhets 07d20657ce Style CI projects page and builds list 2015-09-16 19:59:21 +02:00
Stan Hu 71cdb24990 Fix default avatars to ensure that helpers don't have /assets dir appended 2015-09-16 10:52:23 -07: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 5772faf19b Fix projects edit 2015-09-16 16:46:10 +02:00
Kamil Trzcinski ac8d2eb065 Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-16 13:34:58 +02:00
Stan Hu c61b6eeb2f Merge pull request #9634 from allistera/users-autocomplete-sort-order 
Sorted autocomplete users list by name
 2015-09-15 16:41:15 -07:00
Allister Antosik c9389d0e74 Sorted autocomplete users list by name 2015-09-15 22:48:24 +01:00
Kamil Trzcinski fb9cb3f06c Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-15 23:20:00 +02:00
Stan Hu 61737af503 Merge branch 'fix-upload-ui' into 'master' 
Cleanup some html/css for upload feature

* fix colors to match UI style
* cleanup templates from meaningless code
* improve placeholders
* remove code duplication in template
* improve error handling: remove file automatically

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

For #2520

See merge request !1297
 2015-09-15 20:56:11 +00: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
Drew Blessing 0ad669bb5b Merge branch 'slack-help-text' into 'master' 
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

See merge request !1302
 2015-09-15 20:36:32 +00:00
Kamil Trzcinski fe42de3a48 Fix: features/ci/admin/runners_spec.rb 2015-09-15 22:15:28 +02:00
Stan Hu d9af6f79ed Change the replace placeholder to use the filename 
Dynamically adjust placedholder for uploads and fix Dropzone event handlers

Override error handler to prevent error messages from being inserted underneath image preview

Fix tests

Use regexp instead of startsWith for better browser compatibility

Remove duplicate code in _replace.html.haml and use one template

Remove files upon error and retain alert messages until user adds a new file
 2015-09-15 13:07:32 -07:00
Robert SchillingandStan Hu 0a8ef29b3d Improve wording for header and placeholders 2015-09-15 13:07:32 -07:00
Dmitriy ZaporozhetsandStan Hu e14aa19e39 Cleanup some html/css for upload feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-15 13:07:32 -07:00
Jared Szechy 93bb8f14ef Use fixed version of fogbugz gem 
This allows us to properly handle authentication errors.
 2015-09-15 15:23:30 -04: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
Dmitriy Zaporozhets 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:**

![Screen_Shot_2015-09-14_at_11.20.47_AM](https://gitlab.com/dblessing/gitlab-ce/uploads/07b39641f602e01440dd5558a0d80237/Screen_Shot_2015-09-14_at_11.20.47_AM.png)

**As proposed:**

![Screen_Shot_2015-09-14_at_11.20.29_AM](https://gitlab.com/dblessing/gitlab-ce/uploads/1c3b1d73584c68a88cd1b0fcf3d6ea5b/Screen_Shot_2015-09-14_at_11.20.29_AM.png)

See merge request !1291
 2015-09-15 16:07:22 +00:00
Dmitriy Zaporozhets 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:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/d8456334a2a9187b56a885f8849f229e/image.png)

After:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9823e8a2baf02859c4c3f05f3a5c35bf/image.png)

See merge request !1295
 2015-09-15 16:04:20 +00:00
Valery Sizov b87ca7500f fix specs. Stage 7 2015-09-15 17:43:17 +03:00
Stan Hu 2abe733866 Display "Forking in Progress" when importing a forked project 2015-09-15 06:45:03 -07:00
Stan Hu 4d2b67acc0 Don't display "git clone --bare <URL>" if no URL is available 
Introduced in !1231
 2015-09-15 06:39:37 -07:00
Valery Sizov e2cbb36ba9 fix specs. Stage 5 2015-09-15 15:51:03 +03:00
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets 080a086d76 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-09-15 11:47:30 +02:00
Dmitriy Zaporozhets dacff8f014 Fix UI for web editor 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-15 11:17:22 +02:00
Dmitriy Zaporozhets a635e1a395 Fix last push widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-15 11:02:37 +02:00
Dmitriy Zaporozhets 558084f403 Improve project settings button on profile 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-15 09:54:42 +02:00
Stan Hu 81e741af24 Merge pull request #9138 from liyakun/master 
add "replace" and "upload" functionality
 2015-09-14 17:57:41 -07:00
liyakun 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
Dmitriy Zaporozhets ebd06d7e7d Make small ui fixes for CI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-14 21:00:06 +02:00
Dmitriy Zaporozhets b5c681c0c9 Add current_ref helper method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-14 20:23:01 +02:00
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets 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
Drew Blessing 789d06e48b Fix empty project UI 2015-09-14 11:20:18 -05:00
Dmitriy Zaporozhets 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
Dmitriy Zaporozhets 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
Drew Blessing 539f30ddcf Fix tooltip display in list views 2015-09-14 08:45:16 -05:00
Dmitriy Zaporozhets 3e97de838c Hide search panel for group page if you dont have access 2015-09-14 15:01:04 +02:00
Dmitriy Zaporozhets db197aa61a Fix tests and improve wording 2015-09-14 14:16:08 +02:00
Kamil Trzcinski f31d8ef287 Merge commit '4c53cc0ebac36560d806732ff1fefba9206c75f3' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 
* commit '4c53cc0ebac36560d806732ff1fefba9206c75f3':
  rubocop satisfy

Conflicts:
	app/controllers/ci/builds_controller.rb
	app/controllers/ci/commits_controller.rb
 2015-09-14 14:04:08 +02:00