home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-10 21:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
643 Commits
Author SHA1 Message Date
Robert Speicher 48cf97e8d3 Merge branch 'cache-events' into 'master' 
Cache all events

Use CSS to determine if the current user needs to see "Congratulations! Tweet about it" by project creation events and "Create Merge Request" by push events.

Implemented as described here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/911#note_1559710

Addresses #2054, in part.

cc @dzaporozhets 

See merge request !1103
 2015-08-09 02:03:46 +00:00
Dmitriy Zaporozhets 7a9d432cdb Add abuse report management in admin area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-06 15:08:22 +02:00
Douwe Maan 9bd074d4cf Use display: inline where appropriate 2015-08-06 14:55:03 +02:00
Douwe Maan c015f96ba4 Cache all events 2015-08-06 13:15:33 +02:00
Marin Jankovski aee579eac2 Use mdash to prevent breaking html emails. 2015-07-22 11:31:15 +02:00
Dmitriy Zaporozhets 98cb6256fa Add nice scroll for sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-14 12:29:57 +02:00
Dmitriy Zaporozhets 62da53af33 Hide icon for bact-to-location menu in sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-13 11:56:08 +02:00
Dmitriy Zaporozhets 98291295a7 Merge branch 'rs-issue-1908' into 'master' 
Add Safari/iOS and Windows 8 logo information

Now that we've got our 🔥 new logo, let's spread it around a bit more!

Closes #1908

See merge request !944
 2015-07-13 08:54:56 +00:00
Robert Speicher 5431368ad1 Update msapplication-TileColor value 2015-07-10 14:04:56 -04:00
Dmitriy Zaporozhets e4a1d29077 Better name for group tab 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-10 13:29:46 +02:00
Dmitriy Zaporozhets 4dfded8934 Make left menu more hierarchical and less contextual by adding back item at top 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-10 13:29:46 +02:00
Robert Speicher c4330d97b1 Add Windows 8 pinned site tile meta tags 2015-07-09 01:43:48 -04:00
Robert Speicher 6591485562 Add Safari/iOS versions of the logo 2015-07-09 01:43:46 -04:00
Dmitriy Zaporozhets 8404ab46b9 Add shortcut for project activity page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 12:43:46 +02:00
Dmitriy Zaporozhets d192f921c1 Move project activity to separate tab. Add more features to project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-07 16:01:12 +02:00
Valery Sizov 411829fdb5 Audit log for user authentication 2015-07-06 12:36:08 +03:00
Nicolas a521e88fc0 Fix consistency issue in sidebars of Project and Group Settings. 
Fixes #2277.
 2015-06-24 18:05:16 +02:00
Dmitriy Zaporozhets 615257b91c Merge branch 'animation-sidebar' into 'master' 
Animation of Sidebar (video in here)

Edited the CSS of header and sidebar; added a new div of gitlab-logo-container to the html to make things easier.

The transition-duration is set to 0.3s and when the nav bar expands, it opens up over the text, essentially revealing hidden text.

[animation-sidebar-2.mov](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b15996a256d6bed03a19c68549d116e4/animation-sidebar-2.mov)

/cc @JobV @nicolas2

See merge request !849
 2015-06-23 08:53:31 +00:00
Darby 9209f43b32 Edited the CSS of header and sidebar; added a new class of logo-container to the html to make things easier 2015-06-19 09:54:26 -07:00
Dmitriy Zaporozhets f5e0e5c0a3 Replace old logo with new one 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-19 16:59:16 +02:00
Robert Speicher 09b4e11d26 Bootlint: Add missing type attribute for buttons 2015-06-16 13:33:48 -04:00
Douwe Maan 9af2bc8907 Merge branch 'header_layout_issue' into 'master' 
Fix layout issue in header title truncation.

@douwe Thanks for reviewing this fix for the issue mentioned in https://dev.gitlab.org/gitlab/gitlabhq/issues/2314#note_48539.

**BEFORE**

![before](https://dev.gitlab.org/gitlab/gitlabhq/uploads/4ffb35f77155a92c64cfe36c66987eb0/before.gif)

**AFTER**

![after](https://dev.gitlab.org/gitlab/gitlabhq/uploads/2bb2d0c4a93164f6d47e24cdcb9a106b/after.gif)

See merge request !1867
 2015-06-16 12:34:21 +00:00
Douwe Maan 63969337a9 Merge branch 'applications_form' into 'master' 
Fix UI issues in Applications form

@douwe Thanks for reviewing this small fix.

---

Before:

![application_form_before](https://dev.gitlab.org/gitlab/gitlabhq/uploads/11fbee17ad6a4c9456cd7d6cba5ae429/application_form_before.png)

---

After:

![application_form_after](https://dev.gitlab.org/gitlab/gitlabhq/uploads/0c64214ccda6c77095f468fcb8c748f3/application_form_after.png)

See merge request !1859
 2015-06-16 11:50:13 +00:00
Nicolas d8209aebdc Fix layout issue in header title truncation. 2015-06-16 04:16:26 +02:00
Nicolas eccdbe367e Highlight Applications nav item when validation fails. 2015-06-14 17:35:03 +02:00
Robert Speicher 6de3958364 Account for RootController for dashboard navigation and Dispatch JS 2015-06-13 17:59:11 -04:00
Robert Speicher 94d3c1433d Add RootController 
This controller is now the target for `root_url`. It sub-classes
DashboardController so we can render the old default without a redirect
if the user hasn't customized their dashboard location.
 2015-06-13 17:59:11 -04:00
Robert Speicher 5f20574db5 Fix a few remaining references to the old Theme names/IDs 2015-06-13 17:58:17 -04:00
Robert Speicher 8112f7550b Add PreferencesHelper module 
Consolidates the helpers related to user preferences.

Renames `app_theme` to `user_application_theme` to better explain what
it is.
 2015-06-13 17:58:16 -04:00
Robert Speicher 821fc4b034 Add Profiles::PreferencesController 2015-06-13 17:58:15 -04:00
Nicolas e34c1169a5 Fix alignment of Project Settings nav icons. 2015-06-10 00:43:07 +02:00
Dmitriy Zaporozhets 269c2d2efc Merge branch 'move_project_members_link' into 'master' 
Move Project Members link from Settings to main menu.

Addresses #2278.

See merge request !1846
 2015-06-09 18:23:35 +00:00
Nicolas ebe4963871 Move Project Members link from Settings to main menu. 
Addresses #2278.
 2015-06-09 14:45:38 +02:00
Douwe Maan eb80edd34f Move page-specific JS out of head and into body. 2015-06-09 12:01:18 +02:00
Dmitriy Zaporozhets ebaa1e5a89 Fix header for mobiles 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 16:34:07 +02:00
Dmitriy Zaporozhets 61a3cd6351 Move logout buttom to top right corner 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 15:50:26 +02:00
Dmitriy Zaporozhets 5a026152b7 Merge branch 'warn-about-referenced-users' into 'master' 
Show warning when a comment will add 10 or more people to the discussion.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2054

New issue:

![Screen_Shot_2015-06-02_at_14.48.46](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6771ff8748b9b548a9f0f32a5a8b9bb1/Screen_Shot_2015-06-02_at_14.48.46.png)

New comment:

![Screen_Shot_2015-06-02_at_14.48.51](https://gitlab.com/gitlab-org/gitlab-ce/uploads/25ec5f06490e1e6b36e453e055a7b403/Screen_Shot_2015-06-02_at_14.48.51.png)

See merge request !754
 2015-06-05 13:37:08 +00:00
Dmitriy Zaporozhets 8d2996fe0e Fix empty header 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 12:08:43 +02:00
Douwe Maan 4ae67fcaef Show warning when a comment will add 10 or more people to the discussion. 2015-06-05 12:07:13 +02:00
Dmitriy Zaporozhets 01f6ae2351 improve navbar collapse for mobile views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 17:55:20 +02:00
Dmitriy Zaporozhets e7e07fab5d Refactor header views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 17:09:30 +02:00
Dmitriy Zaporozhets 46e3d13eac More fixes to header css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 16:36:26 +02:00
Dmitriy Zaporozhets d4dde374aa Refactor header css/html 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 15:45:36 +02:00
Dmitriy Zaporozhets 467d7f6720 Improve UI of project sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-29 18:12:31 +02:00
Mike Butsko b8977cb432 Remove extra brace 2015-05-28 16:09:07 -04:00
Dmitriy Zaporozhets dcc9dc94d5 Re-organize profile settings titles and headers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-28 14:44:38 +02:00
Dmitriy Zaporozhets 6cf45dde0c Replace some icons in header 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-27 17:56:36 +02:00
Dmitriy Zaporozhets 4146ce559e Merge branch 'profile-in-sidebar' into 'master' 
Move user avatar and logout button to sidebar

Related to https://dev.gitlab.org/gitlab/gitlabhq/issues/2272

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

See merge request !719
 2015-05-27 11:52:53 +00:00
Dmitriy Zaporozhets fcc0ff2ccd Merge branch 'nav-settings' into 'master' 
Clarify navigation labels for Project Settings and Group Settings.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2337.

See merge request !703
 2015-05-27 11:48:33 +00:00
Dmitriy Zaporozhets 56ab471f98 Move user avatar and logout button to sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-27 13:17:14 +02:00