home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,925 Commits 48 Branches 340 Tags
b39b156407f5ef1ea483dcd8d628d4835d02b2ff
Commit Graph
994 Commits
Author SHA1 Message Date
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
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 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
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
Douwe Maan a6997e339b Merge branch 'master' into dashboard-titles 2015-09-10 13:13:01 +01:00
Stan Hu 253bc0ca15 Fix test 2015-09-10 00:19:53 -07: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
Douwe Maan 89f166021f Fix snippets exploration test 2015-09-09 09:29:42 +01:00
Douwe Maan 5c961b9cc5 Fix spec 2015-09-09 09:28:09 +01:00
Valery Sizov b7431ec042 Make all group public 2015-09-09 11:27:03 +03:00
Douwe Maan f87f6480b2 Use new routing helper 2015-09-08 17:53:16 +01:00
Douwe Maan 5d785457db Clean up overlap between dashboard and explore. 
- Split up SnippetsController into separate dashboard and explore sections.
- Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not.
 2015-09-08 14:49:20 +01:00
Douwe Maan 260fcd4520 Consistently case Back to X links. 2015-09-08 14:43:41 +01:00
Dmitriy Zaporozhets e0da2c3523 Merge branch 'ui-improvements' into 'master' 
Ui improvements

* fix project home page when activity set as default
* style commits, branches and tags pages to new style
* render flash message outside of content block
* style group pages

See merge request !1255
 2015-09-07 14:17:00 +00:00
Dmitriy Zaporozhets 2b31989582 Fix compare tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-07 14:55:42 +02:00
Valery Sizov 954dd7ce87 Merge branch 'crowd' into 'master' 
Crowd integration

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

See merge request !1228
 2015-09-07 11:20:03 +00:00
Dmitriy Zaporozhets 183562bc35 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-07 12:45:06 +02:00
Valery Sizov 9836017c70 satisfy rubocop 2015-09-07 13:15:27 +03:00
Douwe Maan 662cf2cef4 Merge branch 'fix-wiki-page-history' into 'master' 
Fix broken Wiki Page History

This MR fixes the broken Page History on the Wiki pages. It turns out `WikiHelper` did not allow users to view different versions due to its omitting of query string parameters, which was necessary to specify different `version_id` parameters. Instead of this hacky approach, use manually-specified wildcard routes that match the ID field properly for slashes.

Closes #2104

Closes #1751

Closes #1592

Closes https://github.com/gitlabhq/gitlabhq/issues/9399

See merge request !1232
 2015-09-07 09:27:48 +00:00
Dmitriy Zaporozhets aa75e76a0a Fix this crazy random failing test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 15:36:25 +02:00
Dmitriy Zaporozhets 8b5a14fd0a Fix failing test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-04 14:53:25 +02:00
Dmitriy Zaporozhets 858675ff8a Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 22:25:52 +02:00
Dmitriy Zaporozhets c2a9e6ea67 Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-03 22:15:21 +02:00
Valery Sizov 6bd3d72bbd added spinach for glabal labels 2015-09-03 19:02:14 +03:00
Dmitriy Zaporozhets 774c523c1f Fix tests and update CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-02 20:02:26 +02:00
Valery Sizov 81fe6f9d7e added spinach 2015-09-02 16:17:30 +03:00
Stan Hu fbb891c8f3 Fix broken Wiki Page History 
Closes #2104

Closes #1751

Closes #1592

Closes https://github.com/gitlabhq/gitlabhq/issues/9399
 2015-09-01 23:29:27 -07:00
Valery Sizov ff30b40754 Make all profile public 2015-08-27 13:06:14 +03:00
Dmitriy Zaporozhets ef0149dd44 Merge branch 'enable_ssl_verification_web_hook' into 'master' 
Enable SSL verification for Webhooks

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

See merge request !1135
 2015-08-26 16:06:02 +00:00
Valery Sizov bafffb2d14 Enable SSL verification for Webhooks 2015-08-26 15:48:31 +03:00
Dmitriy Zaporozhets a0284b5b85 Merge branch 'separate-activity' into 'master' 
Separate activity page

Move activity to separate page.

Part of #2225

![Screenshot_2015-08-25_15.07.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2126b22ed7b98a2f748c96ad60bc8b2e/Screenshot_2015-08-25_15.07.23.png)

See merge request !1198
 2015-08-25 16:19:12 +00:00
Dmitriy Zaporozhets 7569010bc3 Fix tests and last push widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-25 16:36:54 +02:00
Dmitriy Zaporozhets 429c0d1491 Merge branch 'fix-reload-with-full-diff-in-compare-branch' into 'master' 
Fix "Reload with full diff" URL button in compare branch view

This button worked when viewing merge requests because the JavaScript
stripped the .html in the Ajax request. However, it left the .html suffix
in the compare branch view.

See merge request !1195
 2015-08-25 14:13:05 +00:00
Stan Hu 3bee4a6712 Fix "Reload with full diff" URL button in compare branch view 
This button worked when viewing merge requests because the JavaScript
stripped the .html in the Ajax request. However, it left the .html suffix
in the compare branch view.
 2015-08-24 23:35:26 -07:00
Valery Sizov 56527b63e8 Ability to search milestones 2015-08-24 13:59:01 +03:00
Douwe Maan 0daa21ed8c Merge branch 'fix-email-autocomplete' into 'master' 
Fix bug preventing invite by e-mail

This was broken in 70f5291808 as a result of introducing the ability to filter by current user.

Closes #2320

See merge request !1181
 2015-08-21 22:25:59 +00:00
Stan Hu 3715a0f29b Fix bug preventing invite by e-mail 
This was broken in 70f5291808 as a result of introducing the ability to filter by current user.

Closes #2320
 2015-08-21 13:47:56 -07:00
Dmitriy Zaporozhets 8819007c83 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-20 14:19:32 +02:00
Dmitriy Zaporozhets e06e9623fd Fix test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-20 12:32:44 +02:00
Artem Sidorenko e238a8dad5 Import sources: show only enabled sources 2015-08-20 12:13:22 +02:00
Artem Sidorenko 0719022739 Spinach tests 2015-08-19 13:47:03 +02:00
Dmitriy Zaporozhets 72a425fa66 Merge branch 'remove-satellites' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-19 09:52:39 +02:00
Ben Bodenmiller 692e381e0c capitalize URL in "Home page URL" 2015-08-17 23:16:18 -07:00
Dmitriy Zaporozhets 9649f9387a Fix tests for web editor 2015-08-14 15:08:31 +02:00
Dmitriy Zaporozhets 69c193e78a Merge branch 'master' into remove-satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 22:48:55 +02:00
Dmitriy Zaporozhets cb6ad67f52 Merge branch 'check-out-branch-button' into 'master' 
Add "Check out branch" button to the MR page.

I appreciated the thought behind adding the "Fetch this branch using ..." line, but not so much the implementation. I think a "Check out branch" button alongside the existing "Download as" makes more sense to get instructions on how to get the changes on your local machine, since that's pretty much what "Download as" does as well. 

Like the "command line", the button opens the command line merge instructions modal. I've improved the text of that modal in !1120.

![Screen_Shot_2015-08-08_at_22.10.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fd185df012e9759dfea198ed9fa3f80f/Screen_Shot_2015-08-08_at_22.10.19.png)

It looks even better in combination with !1121, which gets rid of the "If you want to ..." line:

![Screen_Shot_2015-08-08_at_22.10.55](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3fa469d0e2bd4e3ec4992ffa5864c718/Screen_Shot_2015-08-08_at_22.10.55.png)

cc @dzaporozhets @rspeicher 

See merge request !1116
 2015-08-11 17:49:06 +00:00
Dmitriy Zaporozhets 3e259ea8bc Revert "Merge branch 'revert-satellites' into 'master' " 
This reverts commit 5daf44b7c8, reversing
changes made to 2f706fbd23.
 2015-08-11 14:33:31 +02:00
Dmitriy Zaporozhets 9f10943c1a Revert "Merge branch 'drop-satellites'" 
This reverts commit 957e849f41, reversing
changes made to 6b9dbe9f5a.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-11 10:28:42 +02:00