Commit Graph
22224 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets de11c13ac0 Fix dashboard groups test 2015-03-08 22:39:37 -07:00
Dmitriy Zaporozhets dbb514e764 Merge branch 'active-users' into 'master'
Show active users(non-blocked) on admin dashboard

For gitlab/gitlab-ee#248

See merge request !1656
2015-03-09 05:31:47 +00:00
Dmitriy Zaporozhets 6187670f9f Merge branch 'fix-dev-fixture' into 'master'
Fix user fixtures for development

See merge request !1657
2015-03-09 04:41:24 +00:00
Dmitriy Zaporozhets 7e4258777f Move Profile groups tests to Dashboard group tests 2015-03-08 20:52:22 -07:00
Dmitriy Zaporozhets bb9560a35a Show total user count on dashboard page 2015-03-08 20:45:03 -07:00
Martin Bastien 21aff22adb Fix link to bitbucket import documentation
Signed-off-by: Martin Bastien <martin.bastien@studiofrenetic.com>
2015-03-08 22:26:46 -04:00
Dmitriy Zaporozhets 27e3b47b7f Fix user fixtures for development 2015-03-08 17:35:49 -07:00
Dmitriy Zaporozhets bb7be246f6 Show active users(non-blocked) on admin dashboard 2015-03-08 17:30:01 -07:00
Dmitriy Zaporozhets 9b3e156e43 Move profile groups page to dashboard 2015-03-08 17:03:30 -07:00
Vinnie Okada 928fc94c3d Enforce restricted visibilities for snippets
Add new service classes to create and update project and personal
snippets.  These classes are responsible for enforcing restricted
visibility settings for non-admin users.
2015-03-08 17:57:08 -06:00
Dmitriy Zaporozhets 8b551ee318 Merge branch 'emails-on-push'
Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/project_services/emails_on_push_service.rb
2015-03-08 16:49:11 -07:00
Dmitriy Zaporozhets c025c0d589 Merge branch 'webstorage-exception' into 'master'
Properly handle autosave local storage exceptions.

Addresses https://gitlab.com/gitlab-org/gitlab-ce/issues/1182.

See merge request !1643
2015-03-08 23:43:40 +00:00
Dmitriy Zaporozhets cec2be2d76 Merge branch 'fix-milestone-list-width' into 'master'
Fix width of text in milestone lists and add assignee icon to merge requests.

Before:

![Screen_Shot_2015-03-06_at_13.48.00](https://dev.gitlab.org/gitlab/gitlabhq/uploads/5754638a3ebb79dee1f6c07a6e268035/Screen_Shot_2015-03-06_at_13.48.00.png)

After:

![Screen_Shot_2015-03-06_at_13.48.14](https://dev.gitlab.org/gitlab/gitlabhq/uploads/fe92adf387964efb3d460dfc61ced3b8/Screen_Shot_2015-03-06_at_13.48.14.png)

I've checked with other screen widths as well, and it looks good all the time.

See merge request !1645
2015-03-08 23:41:26 +00:00
Dmitriy Zaporozhets 83e60cc2b9 Merge branch 'commit-range-reference' into 'master'
Automatically link commit ranges to compare page.

Closes #2103

Implemented as proposed in the last paragraph of the issue:

> We could do something similar to Ruby, where `1..5` means `1,2,3,4,5` and `1...5` means `1,2,3,4`: `..` means inclusive, `...` means exclusive. In our case, `sha1...sha4` would mean `sha2,sha3,sha4` (exclusive with regards to `sha1`) and `sha1..sha4` would mean `sha1^...sha4`, i.e. `sha1,sha2,sha3,sha4` (inclusive to `sha1`).

- `sha1...sha4` now links to `compare/sha1...sha4`
- `sha1..sha4` now links to `compare/sha1^...sha4`.

See merge request !1649
2015-03-08 23:39:04 +00:00
Dmitriy Zaporozhets a6bb345d58 Add DevKit and development README links to CONTRIBUTING.md 2015-03-08 16:34:26 -07:00
Dmitriy Zaporozhets f930cf8461 Merge branch 'dev-ui' into 'master'
GitLab UI development kit and UI guide help section

Page with UI elements get generated from current css so you can immediately check how your css changes affects common ui elements. Because it requires GitLab runnning I cannot put it to documentation so I just put link to localhost from development section

cc @developers @sabba @sytse

See merge request !1653
2015-03-08 23:18:32 +00:00
Dmitriy Zaporozhets f3d78ee31a Add markdown info to UI dev kit page 2015-03-08 15:21:47 -07:00
Dmitriy Zaporozhets 1b5ca280d8 Merge two css files with same name 2015-03-08 15:21:28 -07:00
Vinnie Okada 285c534185 Allow admins to override restricted visibility
Allow admins to use restricted visibility levels when creating or
updating projects.
2015-03-08 16:10:05 -06:00
Dmitriy Zaporozhets a3e18d871d Merge branch 'mobile-improvements' into 'master'
Mobile improvements for user page

* hide calendar on small screens
* hide sidebar and show button to toggle it

Fixes #2101

See merge request !1652
2015-03-08 22:00:05 +00:00
Dmitriy Zaporozhets 69d2e1d829 Add UI guide to GitLab development help 2015-03-08 14:56:45 -07:00
Dmitriy Zaporozhets b5c3e1a431 Add GitLab UI development kit 2015-03-08 14:46:22 -07:00
Dmitriy Zaporozhets 2e99d7c915 Prevent date overflow on issue page on mobile devices 2015-03-08 12:15:09 -07:00
Dmitriy Zaporozhets df13c9cac9 Hide user page sidebar for mobilde devices 2015-03-08 12:05:15 -07:00
Vinnie Okada cacac147de Move restricted visibility settings to the UI
Add checkboxes to the application settings page for restricted
visibility levels, and remove those settings from gitlab.yml.
2015-03-07 13:11:08 -07:00
Dmitriy Zaporozhets 1475cb9aaa Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-07 11:24:21 -08:00
Dmitriy Zaporozhets ed616f23d5 Merge branch 'css-cleanup' into 'master'
Reduce amount of custom css and increase usage of default bootstrap

* Copy variables template file for configuring bootstrap variables
* Move layout and bootstrap to `base/` directory and explicitly set import order
* Apply some styles from flatly theme
* Replace bs-callout with alert
* Refactor gitlab css state colors
* Cleanup css variables
* Remove custom css for panels and navs

See merge request !1651
2015-03-07 19:20:41 +00:00
Dmitriy Zaporozhets be3edeb6a1 Small UI improvements after css refactoring 2015-03-07 10:35:17 -08:00
Robert Schilling 4538719df0 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-07 16:35:02 +01:00
Douwe Maan bf02072a86 Properly handle autosave local storage exceptions. 2015-03-07 11:27:39 +01:00
Dmitriy Zaporozhets e2b8025abe Increase input padding and fit issue form in laptop screen 2015-03-07 01:06:16 -08:00
Dmitriy Zaporozhets 4f3d704845 Move mixins and bootstrap css to base directory 2015-03-07 00:29:25 -08:00
Dmitriy Zaporozhets 433b4c76fc Apply some styles from flatly theme 2015-03-07 00:28:53 -08:00
Robert Schilling 0f66b32965 Merge branch 'master' into 'master'
Fix editor in IE producing errors #1096

IE seems to handle form submission oddly. It gets fired twice - once from javascript and once from the form click, producing 2 identical requests and causing #1096.

Similar issues: http://stackoverflow.com/questions/14373800

Returning false from the click event seems to fix it and shouldn't cause any side-effects.

See merge request !366
2015-03-07 08:00:57 +00:00
Robert Schilling 8d9823ab47 Merge pull request #8928 from Mic92/master
use constant-time string compare for internal api authentication
2015-03-07 08:22:58 +01:00
Dmitriy Zaporozhets 887cf5c710 Better name for pages css dir 2015-03-06 21:40:23 -08:00
Dmitriy Zaporozhets ceb8f9dfeb Remove custom css for panels and navs 2015-03-06 21:15:15 -08:00
Dmitriy Zaporozhets 3cbc0b1c6d Cleanup css variables 2015-03-06 20:02:34 -08:00
Dmitriy Zaporozhets cd73b26e07 Refactor gitlab css state colors 2015-03-06 19:02:12 -08:00
Dmitriy Zaporozhets 3bfd53149c Replace bs-callout with alert 2015-03-06 18:36:22 -08:00
Dmitriy Zaporozhets 3cf4359b00 Merge branch 'mass-change-comments' into 'master'
Send notifications and leave system comments when bulk updating issues.

Resolves https://dev.gitlab.org/gitlab/gitlabhq/issues/1885.

See merge request !1646
2015-03-07 01:06:44 +00:00
Dmitriy Zaporozhets e68ad7fbb8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-06 16:13:43 -08:00
Dmitriy Zaporozhets 7dadd423d5 Merge branch 'condensed-mr-commits' into 'master'
Condense commits already in target branch when updating merge request source branch.

Resolves https://dev.gitlab.org/gitlab/gitlabhq/issues/2043.

![Screen_Shot_2015-03-06_at_17.17.13](https://dev.gitlab.org/gitlab/gitlabhq/uploads/8d03540b7b7294ce07005e6f3db6ed3d/Screen_Shot_2015-03-06_at_17.17.13.png)

(Not shown in screenshot, but works fine with rebases as well)

See merge request !1648
2015-03-07 00:13:10 +00:00
Douwe Maan 4dddaef866 Automatically link commit ranges to compare page. 2015-03-07 00:46:13 +01:00
Douwe Maan 84ebc22ad2 Use 2 periods instead of 3 to signify inclusive range. 2015-03-06 23:12:26 +01:00
Douwe Maan 1cc41ce1ad Merge branch 'normalize-slack-hipchat-messages' into 'master'
Add tag push notifications to HipChat and Slack messages and normalize output of messages to be consistent

Add tag_push event notification to HipChat and Slack services.

For each service, normalize message output to use:
- User name instead of username
- Include first line of title in message description
- Link to "Issue #X" instead of "#X"

See merge request !370
2015-03-06 21:23:41 +00:00
Jörg Thalheim 9f089ac48c use constant-time string compare for internal api authentication
Ruby str_equal uses memcmp internally to compare String.
Memcmp is vunerable to timing attacks because it returns early
on mismatch (on most x32 platforms memcmp uses a bytewise comparision).
Devise.secure_compare implements a constant time comparision instead.
2015-03-06 20:06:26 +01:00
Douwe Maan 663b3c968f Condense commits already in target branch when updating merge request source branch. 2015-03-06 18:09:00 +01:00
Stan Hu ad14ed5e49 Add tag_push event notification to HipChat and Slack services.
Normalize output to use:
- User name instead of username
- Include first line of title in message description
- Link to "Issue #X" instead of "#X"
2015-03-06 08:31:49 -08:00
Dmitriy Zaporozhets 0625d68f75 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-06 08:28:26 -08:00