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
24,448 Commits 48 Branches 340 Tags
fa1fa437ca5b894f5590ffbbd08c82e7e5aaea7a
Commit Graph
12367 Commits
Author SHA1 Message Date
Alfredo Sumaran fa1fa437ca Keep edited time on the same line as well 2016-02-29 10:53:44 -05:00
Alfredo Sumaran 9f2eb025d3 Apply nice date when diff page loads 2016-02-29 10:50:35 -05:00
Alfredo Sumaran 1a94a569cf Keep date in the same line 2016-02-29 10:49:48 -05:00
Alfredo Sumaran 60799ae3f6 Prevent content misalignment 2016-02-29 10:45:49 -05:00
Robert Speicher 2c6e34bc16 Merge branch 'repository-caching-refactor' into 'master' 
Refactor Repository Caching

Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/13515

See merge request !2936
 2016-02-26 22:07:50 +00:00
Jacob Schatz 01160fc061 Merge branch 'avatar-cropping' into 'master' 
Fix avatar stretching by providing a cropping feature

Originally by @nesk at https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2773

Fixes #7959

See merge request !2951
 2016-02-26 17:56:24 +00:00
Rémy Coutable 4bff9daf8b Merge branch 'sidebar-hide-class' into 'master' 
Created helper class to hide content in issue sidebar when collapsed

![Screen_Shot_2016-02-25_at_10.38.39](/uploads/ca49cc230edf7e71b7726e905f523092/Screen_Shot_2016-02-25_at_10.38.39.png)

Closes #13764

See merge request !2968
 2016-02-26 16:42:25 +00:00
Dmitriy Zaporozhets cc8b08722d Merge branch 'refactor-lists' into 'master' 
Refactor html/css for lists and improve help UI page

* dry lists html/css removing a lot of style duplicates
* fix snippets list to match common style
* fix extra bottom margin for groups list
* improve help page ui so it looks clean

Fixes #11873 

See merge request !2977
 2016-02-26 14:59:32 +00:00
Alfredo Sumaran 08ec838ed5 Merge branch 'master' into avatar-cropping 2016-02-26 09:32:07 -05:00
Dmitriy Zaporozhets 421aa858e1 Improve help UI page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-26 15:17:13 +01:00
Dmitriy Zaporozhets 012ea64d00 Fix description margin for groups list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-26 15:02:34 +01:00
Dmitriy Zaporozhets d51f3b7b35 Refactor styles for merge requests list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-26 14:48:25 +01:00
Dmitriy Zaporozhets 2b5a6487ba Refactor styles for issues list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-26 14:44:39 +01:00
Dmitriy Zaporozhets 2e2b96a40d Refactor css for groups list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-26 14:44:39 +01:00
Dmitriy Zaporozhets 82064a7c1a Refactor css for snippets list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-26 14:44:39 +01:00
Dmitriy Zaporozhets 5a1afb48fe Cleanup css for projects list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-02-26 14:44:39 +01:00
Marin Jankovski b2c641de21 Fix syntax error in autosave coffeescript. 2016-02-26 13:22:35 +01:00
Rémy Coutable bb3563b5cd Merge branch 'rs-crowd-form-view-spec' into 'master' 
Move "I should see Crowd login form" feature to a view spec

We were doing all kinds of code gymnastics to "enable" Crowd in the
feature spec and this would sometimes cause a transient failure.

Really what it's testing is if the Crowd login form shows when Crowd's
enabled, so this is much better suited to a view spec.

See merge request !2963
 2016-02-26 11:27:27 +00:00
Robert Speicher 37e5b94499 Merge branch 'fix-todos' into 'master' 
Does not create a Todo when commenting on commit or project snippet

Closes #13733

See merge request !2964
 2016-02-25 18:54:06 +00:00
Dmitriy Zaporozhets 820d227b9e Merge remote-tracking branch 'origin/Baertierchen/gitlab-ce-showTestCoverage' 2016-02-25 19:02:57 +01:00
Yorick Peterse 3b520efdc7 Moved exists condition in Repository#before_delete 
This is only needed when calling the "expire_cache" method as the other
expiration methods don't depend on Git data.
 2016-02-25 12:55:37 +01:00
Phil Hughes 0bfb71248c Created helper class to hide content in issue sidebar when collapsed 
Closes #13764
 2016-02-25 10:35:52 +00:00
Alfredo Sumaran b2dcfc4db3 Merge branch 'rs-crowd-form-view-spec' into avatar-cropping 2016-02-24 19:10:50 -05:00
Douglas Barbosa Alexandre c1482943c4 Does not create a todo when commenting on commit or project snippet 2016-02-24 21:09:40 -03:00
Jacob Schatz 856153d712 Merge branch 'feature/jschatz1/sidebar-sizing' into 'master' 
Sidebar overlaps content when screen is below 1200px.

When screen is below 1200px, the sidebar overlaps.
When screen is above 1200px, the sidebar pushes content out.
z-index change to make sure hamburger stays on top.
Fixes #12717 
![screensize](/uploads/9a21fa06d583a49d6ebbf1ada34c6792/screensize.gif)

![screensize-small](/uploads/7c25f46e962248a40840562a01c83f8f/screensize-small.gif)

Also sorry I couldn't get the collapse button in the screen cap. It's there. 


See merge request !2620
 2016-02-24 23:09:29 +00:00
Robert Speicher b95ef77e23 Move "I should see Crowd login form" feature to a view spec 
We were doing all kinds of code gymnastics to "enable" Crowd in the
feature spec and this would sometimes cause a transient failure.

Really what it's testing is if the Crowd login form shows when Crowd's
enabled, so this is much better suited to a view spec.
 2016-02-24 17:38:13 -05:00
Alfredo Sumaran ccabbaa9b3 Wait until listeners are set before triggering a 'click' event 2016-02-24 15:53:39 -05:00
Alfredo Sumaran 7fdc29715a Remove unused methods 2016-02-24 15:40:36 -05:00
Alfredo Sumaran 4d23af7507 Move script inside of MergeRequestTabs class 2016-02-24 15:39:56 -05:00
Alfredo Sumaran a4e522a889 Merge branch 'master' into minimize-on-diff 2016-02-24 14:06:55 -05:00
Robert Speicher 93e6282657 Add :with_avatar trait to User factory 2016-02-24 13:50:03 -05:00
Dmitriy Zaporozhets fc31840d4e Merge branch 'andywgrant/gitlab-ce-master' into 'master' 
Add "issue" to Close/Reopen buttons for clarity

_Originally opened by @andywgrant at !2884_

---

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13549

See merge request !2929
 2016-02-24 16:32:56 +00:00
Alfredo Sumaran 0104ab79b3 Merge branch 'master' into avatar-cropping 2016-02-24 10:42:51 -05:00
Jacob Schatz 3cb5f14b04 Merge branch 'user-bio-improve' into 'master' 
Improve the formatting for the user page bio

Resolves #13406.

Problems, per the Issue above:
- The bio has an extra period appended by the HAML view.
- The bio isn't given its own line, not differentiated from username and account creation date.
- The bio is allowed to span almost the full width of the container, would probably look better if it were only allowed a max width of something like 750px.

This commit:
- Separates the User page bio from the username and account creation
date.
- Separates the pseudo-selector adding a Middle Dot out from the
`profile-link-holder` class and into a `middle-dot-divider` class.

Before:
![Screen_Shot_2016-02-15_at_3.55.28_PM](/uploads/fbe410c3f436740121c5f4686e0f44d0/Screen_Shot_2016-02-15_at_3.55.28_PM.png)

With this Merge Request:
![Screen_Shot_2016-02-15_at_3.55.25_PM](/uploads/b4b16376a395608f57d8f76ab47e241f/Screen_Shot_2016-02-15_at_3.55.25_PM.png)

See merge request !2827
 2016-02-24 12:02:20 +00:00
Jacob Schatz d22ebcf0c3 Merge branch 'highlighted-note' into 'master' 
Changed padding & background color for highlighted notes

Closes #12453

![Screen_Shot_2016-02-23_at_11.18.59](/uploads/19150d884fd1175fe0df5f6daee64206/Screen_Shot_2016-02-23_at_11.18.59.png)

See merge request !2937
 2016-02-24 11:58:37 +00:00
Jacob Schatz 8089a77c4b Merge branch 'gray-content-block-btn-alignment' into 'master' 
Correctly aligned buttons vertical in gray-content-block

Closes #12790 

![Screen_Shot_2016-02-23_at_15.09.19](/uploads/e5c6d97d8c1712273c87a0d592430390/Screen_Shot_2016-02-23_at_15.09.19.png)

See merge request !2941
 2016-02-24 11:57:15 +00:00
Jacob Schatz 89fc80beb5 Merge branch 'activity-tabs-single-select' into 'master' 
Treats activity tabs as single select

Fixes #8092

![activity-tabs](/uploads/1fb4d9233492252cfd93c74579e97514/activity-tabs.gif)

See merge request !2940
 2016-02-24 11:49:47 +00:00
Rémy Coutable d74cfe7db3 Merge branch 'bugfix/jschatz1/missing-project-button' into 'master' 
Fix group projects styles

Makes new project button visible when no projects are available.
Fixes #13193 

# BEFORE
![Screen_Shot_2016-02-04_at_1.08.27_PM](/uploads/36be9d5892506e7d1abcf4eb2a622e12/Screen_Shot_2016-02-04_at_1.08.27_PM.png)

# AFTER (w/projects)
![Screen_Shot_2016-02-04_at_1.07.48_PM](/uploads/fa257a1965017ff1274572dc66fccf90/Screen_Shot_2016-02-04_at_1.07.48_PM.png)

# AFTER (no projects)
![Screen_Shot_2016-02-04_at_1.07.28_PM](/uploads/326f6fdac24b56e8408efd0d11dc2805/Screen_Shot_2016-02-04_at_1.07.28_PM.png)

cc @creamzy @skyruler 

See merge request !2714
 2016-02-24 10:58:05 +00:00
Phil Hughes 74d87db977 changed bind to on for activity link click event 2016-02-24 08:28:33 +00:00
Phil Hughes 30b56fb017 Treats activity tabs as single select 
Fixes #8092
 2016-02-24 08:28:33 +00:00
Robert Speicher dba47f680d Merge branch 'issue_13301_emoji-menu' into 'master' 
Load award emoji picker with ajax request

Fixes #13301.

See merge request !2888
 2016-02-24 02:50:45 +00:00
Annabel Dunstone 476a804969 Update award_emoji test 2016-02-23 19:37:15 -06:00
Alfredo Sumaran 798c220037 Initialize navigation shortcuts on project's files page 2016-02-23 20:17:16 -05:00
Alfredo Sumaran be0f97a6d4 Initialize navigation shortcuts on project's files page 2016-02-23 20:04:20 -05:00
connorshea bb0f5be077 Improve the formatting for the user page bio 
- Separates the User page bio from the username and account creation
date.
- Separates the pseudo-selector adding a Middle Dot out from the
`profile-link-holder` class and into a `middle-dot-divider` class.

Resolves #13406.

See merge request !2827.
 2016-02-23 16:50:48 -07:00
Alfredo Sumaran b2604f566d Re-use existing top area elements 2016-02-23 18:48:01 -05:00
Jacob SchatzandAlfredo Sumaran 0267954403 Fix group projects styles 
Makes new project button visible when no projects are available.
Fixes #13193
 2016-02-23 18:47:48 -05:00
Alfredo Sumaran af978cd5bc Merge branch 'master' into avatar-cropping 2016-02-23 16:52:43 -05:00
Alfredo Sumaran a3713050f7 Ability to toggle sidebar on smaller screens 2016-02-23 15:28:21 -05:00
Alfredo Sumaran c684bcc8b7 Fixes padding when right sidebar is not present 2016-02-23 15:24:49 -05:00