Commit Graph

885 Commits

Author SHA1 Message Date
Dmitriy Zaporozhets 46503b789d
Fix invalid tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-30 15:29:52 +02:00
Kamil Trzcinski 0f3deac362 Fix tests 2015-09-29 10:47:04 +02:00
Dmitriy Zaporozhets 145d933880
Merge branch 'projects'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-28 13:42:41 +02:00
Aaron Snyder a9cfa6c508 Fix grammar in admin area labels .nothing-here-block when no labels exist.
updating admin area > "Labels" text to "There are no labels yet.", per Stan Hus suggestion.
2015-09-26 11:25:26 -07:00
Dmitriy Zaporozhets 1868c8b258
Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-25 10:04:09 +02:00
Dmitriy Zaporozhets 353d426e4e
Show CI status on Your projects page and Starred projects page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-24 14:00:23 +02:00
Dmitriy Zaporozhets 2be714dcf6
Show CI status on commit page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-24 11:40:48 +02:00
Dmitriy Zaporozhets eae27d1ecb Move CI charts to project graphs area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-23 16:24:46 +02:00
Douwe Maan 183892fde9 Merge branch 'notification-levels' into 'master'
Notification levels can now be set on the Project's main page

![Screen_Shot_2015-09-16_at_7.49.49_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0ac517bdfdc801f0e2115463c3ea9e10/Screen_Shot_2015-09-16_at_7.49.49_PM.png)

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:

![Screen_Shot_2015-09-16_at_6.09.02_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8a6e1fde5177aa3976cadf59fdb8d375/Screen_Shot_2015-09-16_at_6.09.02_PM.png)

@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
Valery Sizov a0c1a12dee remove API calls from CE to CI 2015-09-18 18:02:11 +02:00
Jeroen van Baarsen fe17a236e3 Allow custom info to be added to Help page
Fixes #2536

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-09-18 10:15:40 +02: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:

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

Closes #2382

See merge request !1227
2015-09-17 08:04:37 +00: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
Patricio Cano de1ffce739 Added Spinach tests and updated CHANGELOG 2015-09-16 18:03:48 -05: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
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
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
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