home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,380 Commits 48 Branches 340 Tags
dd533abc59b3ad343c00a46451157bc88e401ced
Commit Graph
24380 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Lopez dd533abc59 gemfile random update 2016-02-24 23:05:35 +01:00
James Lopez 1f7006c59c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/slacky-builds-v2 2016-02-24 23:02:14 +01:00
James Lopez 6466e330c9 updated gitlab-ci script to include builds URL 2016-02-24 22:53:13 +01:00
James Lopez 1df2c1b2e7 test 2016-02-24 22:28:32 +01:00
Achilleas Pipinellis 83ba37e544 Merge branch 'fix_git_tag_in_architecture' into 'master' 
Fixed ~git beeing displayed as link to issues tagged with git in architecture.md

The architecture documentation explains `~git` from the picture below which is replaced by a [link to issues tagged with `git`](https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name=git). I believe that this was unintended and should be fixed by using backticks.

![Screenshot_from_2016-02-13_21-36-30](/uploads/5ea1a60e8b230952874e58eab0abe1ac/Screenshot_from_2016-02-13_21-36-30.png)

See merge request !2814
 2016-02-24 20:16:50 +00:00
Achilleas Pipinellis 8fecb47c07 Merge branch 'commit-status-permission-update' into 'master' 
Update commit status permissions [ci skip]

cc @axil 


See merge request !2942
 2016-02-24 20:15:23 +00:00
James Lopez c2d0671495 make build fail 2016-02-24 18:58:39 +01:00
James Lopez 8eb29056cb testing script 2016-02-24 18:49:14 +01:00
James Lopez 4a9affa733 Merge branch 'feature/slack-notifications-on-ci' into 'master' 
update ci configuration to send slack notifications on failure

Updates CI config file and adds a task to send notifications when a build fails on master or on any tag.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12805

See merge request !2681
 2016-02-24 16:56:42 +00: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
James Lopez 86b97ce196 updated gitlab ci based on feedback 2016-02-24 16:31:33 +01:00
Rémy Coutable fe6f17ceda Add 8.5.1 in CHANGELOG 2016-02-24 13:40:40 +01: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 043208f164 Merge branch 'issue_13602' into 'master' 
Fix look of tooltip for Revert button.

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

See merge request !2900
 2016-02-24 11:45:50 +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 b82569e5ea fixed tests 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
Rémy Coutable bd71438d6a Merge branch 'bring-back-newrelic-gem' into 'master' 
Revert "Remove newrelic gem. Closes #12860"

This reverts commit 531767175f.

Conflicts:
	Gemfile.lock

See merge request !2943
 2016-02-24 07:25:36 +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
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
Robert Speicher 9f80118e05 Merge branch 'rs-update-raven' into 'master' 
Update sentry-raven to 0.15.6

Fixes a few bugs, most notably (for our purposes): https://github.com/getsentry/raven-ruby/pull/450

See merge request !2947
 2016-02-23 21:19:55 +00:00
Robert Speicher 8a6bd6d2b4 Update sentry-raven to 0.15.6 2016-02-23 15:34:16 -05:00
Jacob Schatz 52ac5242d1 Merge branch 'issue_13510' into 'master' 
Adds "e" shortcut to issuable pages which redirects to the Edit page

Closes #13510

See merge request !2945
 2016-02-23 18:21:45 +00:00
Robert Speicher ad3433f91e Merge branch 'hudecof/show-crowd-login-form-when-signin-disabled' into 'master' 
Show Crowd login even when sign-in is disabled

Fixes #13176.

See merge request !2749
 2016-02-23 18:19:41 +00:00
Robert Speicher 5deb4ac144 Merge branch 'fix-todos' into 'master' 
Does not raise an error when Todo  is already marked as done

Closes #13681 

See merge request !2926
 2016-02-23 17:47:59 +00:00
Alfredo Sumaran 89d8e72b6c Update shortcuts image 2016-02-23 12:21:14 -05:00
Alfredo Sumaran 2f63303fdb Add "e" shortcut to help modal 2016-02-23 11:54:56 -05:00
Alfredo Sumaran 8129d1675f Add "e" shortcut to edit issuable 2016-02-23 11:28:23 -05:00
Phil Hughes 647eccd1fa changed variable name to -hover 2016-02-23 16:13:43 +00:00
Jacob Schatz 1142b327e8 Merge branch 'dz-small-ui-fixes' into 'master' 
Set of UI fixes

* Improve wiki pages
* Improve profile pages

cc @skyruler 

See merge request !2758
 2016-02-23 15:38:20 +00:00
Stan Hu 623cd23903 Revert "Remove newrelic gem. Closes #12860" 
This reverts commit 531767175f.

Conflicts:
	Gemfile.lock
 2016-02-23 07:25:37 -08:00
Kamil Trzcinski 7b785fd773 Update commit status permissions [ci skip] 2016-02-23 16:13:12 +01:00
Marin Jankovski f317d5fcb9 Merge branch 'uploads-700' into 'master' 
Restrict permissions on public/uploads

Based on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/631

See merge request !2764
 2016-02-23 15:12:20 +00:00
Phil Hughes 7b2f3a6727 Correctly aligned buttons vertical in gray-content-block 
Closes #12790
 2016-02-23 15:11:37 +00:00
Jacob Schatz 6263a3ca3c Merge branch 'files-view-row-click' into 'master' 
Fixes issue with file view rows not clickable on project main view

Fixed an issue where it would only load the first 25 commit data on project main view.

Stopped the file view sending 1 too many requests.

Fixes #3916

See merge request !2933
 2016-02-23 14:52:21 +00:00
Rémy Coutable 1ff17b6bba Merge branch 'patch-1' into 'master' 
fix some links



See merge request !2812
 2016-02-23 14:33:47 +00:00
Rémy Coutable eb178f6d66 Add a spec to ensure Crowd login form is shown even when sign-in is disabled 2016-02-23 15:13:50 +01:00
Peter HudecandRémy Coutable dcaeee4579 Show Crowd login even when sign-in is disabled 2016-02-23 15:13:50 +01:00
Jacob Schatz 06f7fd2fb7 Merge branch 'empty-repo-instructions-fix' into 'master' 
Users don't get instructions to push to other users empty projects

Fixes #12518

![Screen_Shot_2016-02-22_at_17.38.18](/uploads/42a3c32af1326f15a7b40fd7153a89fb/Screen_Shot_2016-02-22_at_17.38.18.png)

See merge request !2923
 2016-02-23 14:07:36 +00:00
Douglas Barbosa Alexandre 28097398c5 Does not raise an error when Todo is already marked as done 2016-02-23 10:43:29 -03:00
Phil Hughes 01b965f6da Correctly checks if tree view is on screen 2016-02-23 13:41:03 +00:00
Jacob Schatz f5be56710f Merge branch 'milestone-drag-empty-list' into 'master' 
Issues can be dragged & dropped into empty milestone lists

This is also possible with MRs. Also fixed an issue where MRs weren't sortable

Fixes #13668

![milestone](/uploads/aada0f48ce8b1407cce920eef3f4d5f3/milestone.gif)

See merge request !2935
 2016-02-23 12:39:39 +00:00