home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-27 13:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,064 Commits 48 Branches 340 Tags
v7.12.2
Commit Graph
8392 Commits
Author SHA1 Message Date
Douwe Maan d8b267db37 Correctly show anonymous authorized applications under Profile > Applications. 2015-07-02 13:18:01 +02:00
Marin JankovskiandMarin Jankovski d835b20deb Merge branch 'SAML_1888' into 'master' 
Add SAML to list of social_provider

Resolves issue 1888.  Still an issue because the SAML link under Connected Accounts will not have a logo.

See merge request !891
 2015-06-26 11:27:35 +02:00
Stan Hu d5ed8a42ef Fix error when deleting a user who has projects 
Closes #1856
Closes https://github.com/gitlabhq/gitlabhq/issues/9394
 2015-06-23 07:46:24 -07:00
Jacob Vosmaer 93ba5b9048 Merge branch 'ext-issue-7-12' into '7-12-stable' 
!794 for 7-12-stable

Brings !794 to 7-12-stable.

cc @jacobvosmaer

See merge request !826
 2015-06-22 16:03:55 +00:00
Jacob Vosmaer 455b21c5a7 Merge branch 'rename-mr-tabs' into '7-12-stable' 
Revert merge request states renaming

Replaced:

* "Accepted" with "Merged"
* "Rejected" with "Closed"

This is cherry-pick of !844 but for 7-12-stable. For 7.12.1

See merge request !863
 2015-06-22 16:03:03 +00:00
Jacob Vosmaer 1d4266f9aa Merge branch '7-12-fix-post-receive-external-tracker' into '7-12-stable' 
Fix post-receive errors on a push when an external issue tracker is configured

Closes #1700
Closes #1720

See merge request !855
 2015-06-22 16:00:41 +00:00
Dmitriy Zaporozhets 6d679fc347 Fix closed merge request scope at milestone page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 15:44:19 +02:00
Dmitriy Zaporozhets 8c54237020 Revert merge request states renaming 
Replaced:
* "Accepted" with "Merged"
* "Rejected" with "Closed"

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-22 15:44:06 +02:00
Jacob Vosmaer bef405333c Merge branch '7-12-stable' of dev.gitlab.org:gitlab/gitlabhq into 7-12-stable 2015-06-22 12:25:09 +02:00
Dmitriy Zaporozhets 156edd8d6f Merge branch 'web-editor-autocrlf' into 'master' 
Convert CRLF newlines to LF when committing using the web editor.

Fixes #1823 and https://github.com/gitlabhq/gitlabhq/issues/7950.

Depends on https://gitlab.com/gitlab-org/gitlab_git/merge_requests/29 being merged and a new gitlab_git being released.

cc @jacobvosmaer

See merge request !858
 2015-06-22 12:21:51 +02:00
Jacob Vosmaer 87c67b1748 Merge branch '7-12-new-mr-disable-change-target-branch' into '7-12-stable' 
Disable changing of target branch in new merge request page when a branch has already been specified

Closes #1830

See merge request !856
 2015-06-22 10:00:54 +00:00
Stan Hu f7efd26575 Disable changing of target branch in new merge request page when a branch has already been specified 
Closes #1830
 2015-06-20 05:46:20 -07:00
Stan Hu c65634cf3a Fix Error 500 when one user attempts to access a personal, internal snippet 
Closes #1815
 2015-06-20 05:44:23 -07:00
Stan Hu a96f3e1803 Fix post-receive errors on a push when an external issue tracker is configured 
Closes #1700
Closes #1720
 2015-06-20 04:53:53 -07:00
Stan Hu b8fd21f91a Fix 403 Access Denied error messages when accessing Labels section in a project that has MRs disabled but issues enabled 
Closes #1813
 2015-06-18 04:54:49 -07:00
Robert Speicher a28686d331 Fix preferences/show 2015-06-16 12:53:00 -04:00
Robert Speicher f323b8c4e5 Refactor RootController 
cherry-picked
 2015-06-16 12:52:47 -04:00
Robert Speicher 7cff7d6fce Refactor dashboard_choices 
cherry-picked
 2015-06-16 12:52:40 -04:00
Robert Speicher 17af09b190 Remove redundant help text from custom dashboard selection 
cherry-picked
 2015-06-16 12:52:31 -04:00
Robert Speicher 2797daade9 Fix alignment of Behavior form; add documentation link 
cherry-picked
 2015-06-16 12:52:27 -04:00
Robert Speicher 2b4b05727d Spec the failure cases for PreferencesController#update 
cherry-picked
 2015-06-16 12:52:12 -04:00
Robert Speicher f22d80ad75 Make the dashboard choice text match the text in the sidebar 
cherry-picked
 2015-06-16 12:52:08 -04:00
Robert Speicher 8dfe01cbb0 Add feature specs for default dashboard preference 
cherry-picked
 2015-06-16 12:52:04 -04:00
Robert Speicher 878732b426 Add a form field to customize the dashboard preference 
cherry-picked
 2015-06-16 12:52:00 -04:00
Robert Speicher 5e0a812669 Account for RootController for dashboard navigation and Dispatch JS 
cherry-picked
 2015-06-16 12:51:56 -04:00
Robert Speicher bf44988a30 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.

cherry-picked
 2015-06-16 12:51:51 -04:00
Robert Speicher 7f702b33b9 Add dashboard attribute to User model 
cherry-picked
 2015-06-16 12:51:46 -04:00
Robert Speicher 122e83c326 Simplify the javascript behavior for Preference updating 
cherry-picked
 2015-06-16 12:51:42 -04:00
Robert Speicher 59ab9cc9fc Remove js handler from Profiles#update 
It was only used for the appearance live updating, which is now handled
by Profiles::Preferences#update

cherry-picked
 2015-06-16 12:51:34 -04:00
Robert Speicher 3cae81a597 Move the "Design" templates and logic to Preferences 
cherry-picked
 2015-06-16 12:51:23 -04:00
Robert Speicher 471ea73a56 Add Profiles::PreferencesController 
cherry-picked
 2015-06-16 12:51:02 -04:00
Daniel GerhardtandDouwe Maan 565f8f3ee4 Fix hooks for web based events with external issue references 
The creation of cross references for external issues (which would fail)
is now prevented.

Fixes #1650, GH-9333.
 2015-06-16 14:54:14 +02:00
NicolasandDmitriy Zaporozhets b27ef08318 Fix typo on account page. 2015-06-15 18:36:33 +02:00
Dmitriy Zaporozhets 916d7da4a8 Merge branch 'fix-gitlab-ci-yml' into 'master' 
Look for .gitlab-ci.yml only if checkout_sha is present

Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2396

cc @vsizov

See merge request !818
 2015-06-15 18:31:29 +02:00
Dmitriy Zaporozhets f92d6e2423 Merge branch 'remove-activity-feed-text' into 'master' 
Remove text since rss is now to prominent.

See merge request !1855
 2015-06-12 10:41:50 +00:00
Sytse Sijbrandij 91ab3849bd Remove text since rss is now to prominent. 2015-06-12 11:58:18 +02:00
Dmitriy Zaporozhets 21a62bb995 Merge branch 'refactor-mr-widget' into 'master' 
Refactor accept merge request widget

* make each case a simple view
* separate  merge request JS from merge request accept widget JS

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

See merge request !799
 2015-06-12 08:22:13 +00:00
Dmitriy Zaporozhets 5cacc06508 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-12 10:12:43 +02:00
Dmitriy Zaporozhets b63ef1a077 Merge branch 'fix-graph-width' into 'master' 
Fix graph width on different screen sizes

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

See merge request !802
 2015-06-12 08:11:47 +00:00
Dmitriy Zaporozhets b4c02311b7 Merge branch 'fluid-commit-calendar' into 'master' 
Make commit calendar size depend on window size

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

See merge request !801
 2015-06-12 07:30:45 +00:00
Dmitriy Zaporozhets 4e98159022 Merge branch 'rs-issue-1757' into 'master' 
Add negative tabindex to Markdown Write and Preview tabs

Closes #1757

See merge request !796
 2015-06-11 21:17:35 +00:00
Dmitriy Zaporozhets c69ca9912e Merge pull request #9371 from zenati/patch-2 
An `in_namespace` scope is already present
 2015-06-11 23:09:41 +02:00
Dmitriy Zaporozhets aa38dfe938 Fix graph width on different screen sizes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-11 23:00:38 +02:00
Dmitriy Zaporozhets f06f438044 Make commit calendar size depend on window size 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-11 22:52:21 +02:00
Dmitriy Zaporozhets 15cfa5ca20 Fix automerge 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-11 18:49:34 +02:00
Dmitriy Zaporozhets 946b4ceda3 Improve variables in mr widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-11 18:45:12 +02:00
Dmitriy Zaporozhets 8893ac4ba4 Fix rubocop 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-11 18:35:43 +02:00
Dmitriy Zaporozhets 00600a592b Extract merge request widget JS to separate class 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-11 18:27:03 +02:00
Dmitriy Zaporozhets 148178fb98 Merge branch 'rs-issue-1758' into 'master' 
Update grids for 2FA details

Also adds a link to the documentation.

Closes #1758

See merge request !795
 2015-06-11 15:00:08 +00:00
Dmitriy Zaporozhets d2d8037b1a Refactor merge request widget step 2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-11 15:14:50 +02:00