home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kamil Trzcinski 8549d709fb Fix ci/projects_controller_spec.rb 2015-09-15 20:40:52 +02:00
Kamil Trzcinski 269b9224cf Use GitLab instead of GITLAB for rake task 2015-09-15 20:14:22 +02:00
Kamil Trzcinski 7e07bc0698 Remove unused tasks 2015-09-15 20:14:22 +02:00
Kamil Trzcinski ed18e04bb3 Cleanup CI backup => migrate with GitLab 2015-09-15 20:14:21 +02:00
Robert Speicher bc10a48c97 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-09-15 13:50:28 -04:00
Robert Speicher 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
Robert Speicher 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
Robert Speicher 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
Robert Speicher d420b608e6 Minor editing of the 7.14-to-8.0 update guide 2015-09-15 13:24:38 -04:00
Robert Schilling c12590591f Merge pull request #9630 from fscherwi/patch-1 
change coverage image to svg [ci skip]
 2015-09-15 19:14:11 +02:00
fscherwi b9cc41cf34 change coverage image to svg [ci skip] 2015-09-15 18:07:28 +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
Jacob Vosmaer ed38627ec5 Guard against trailing slashes in repos_path 2015-09-15 17:07:51 +02:00
Valery Sizov b87ca7500f fix specs. Stage 7 2015-09-15 17:43:17 +03:00
Jacob Vosmaer 52d7813f2e Improve repo cleanup task 
Clean up more than just global (legacy) repos. Also, instead of
deleting, just rename.
 2015-09-15 16:10:29 +02:00
Marin Jankovski 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
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 88b3195ecf fix specs. Stage 6 2015-09-15 16:29:36 +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
Valery Sizov e2cbb36ba9 fix specs. Stage 5 2015-09-15 15:51:03 +03:00
Valery Sizov 16ba41a186 fix specs. Stage 4 2015-09-15 14:45:59 +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
Valery Sizov 22bf844869 fix specs. Stage 3 2015-09-15 13:50:24 +03: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 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
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
Patricio Cano fa6df2228e Replaced this with @ in the coffee file and added an arrow that clearly marks the Notifications button as a drop down 2015-09-14 20:50:13 -05:00
Patricio Cano 01cc20378b Notification dropdown now shows currently active level, and also shows what the actual value of global is, if the project has the notification level set to global. 2015-09-14 20:33:24 -05:00
Stan Hu 81e741af24 Merge pull request #9138 from liyakun/master 
add "replace" and "upload" functionality
 2015-09-14 17:57:41 -07:00
Patricio Cano 8a6fb46dff Corrected case indentation to conform with Rubocop 2015-09-14 19:40:45 -05:00
Patricio Cano dd2ffafea4 Added spacing to icons in Notification drop down 2015-09-14 19:30:58 -05:00
Patricio Cano adcae6ebd5 Notification level can now be saved from within the project view. 2015-09-14 19:27:54 -05: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
Patricio Cano ab56718feb Fixed notification level list item helper. 2015-09-14 18:40:47 -05:00
Darby 84508c40b7 PAtrially working notification button 2015-09-14 16:37:11 -07:00
Kamil Trzcinski 9a3d0f1d92 Add rake task to migrate CI tags 2015-09-15 00:29:20 +02:00
Dmitriy Zaporozhets 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
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
Robert Schilling 0d01008876 Update gitlab_emoji to 0.1.1 2015-09-14 18:10:23 +02: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
Valery Sizov 910bf96ec3 fix specs. Stage 2 2015-09-14 18:14:17 +03: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