home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 17:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
17,019 Commits 48 Branches 340 Tags
f22d80ad7587ee55cb2d07320ea46dbe7d6156a8
Commit Graph
17019 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jacob Vosmaer 41aead60c6 Version 7.12.0.rc2 v7.12.0.rc2 2015-06-16 17:48:26 +02:00
Dmitriy Zaporozhets 1fb54a2d6b Merge branch 'kerberos_require' into '7-12-stable' 
Kerberos require to stable 7.12

!819 to 7-12-stable

cc @jacobvosmaer

See merge request !827
 2015-06-16 14:23:37 +00:00
Dmitriy Zaporozhets f6ee9b3143 Merge branch '7-12-stable' of dev.gitlab.org:gitlab/gitlabhq into 7-12-stable 2015-06-16 15:26:24 +02:00
Dmitriy ZaporozhetsandMarin Jankovski 940d38b065 Merge branch 'require_kerberos_when_enabled' into 'master' 
If kerberos is enabled require it

Since 'group: :kerberos' got [included in the Gemfile ](https://gitlab.com/gitlab-org/gitlab-ce/commit/2391a43a7073b4e723e9ca1f7ff19b30f8e51452) Kerberos no longer got [loaded when the app started](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/application.rb#L6)

This caused `Devise::OmniAuth::StrategyNotFound` error once Kerberos is enabled, failing to start GitLab .

With this we hopefully do not need to remove group from the Gemfile.

See merge request !819
 2015-06-16 15:14:54 +02:00
Dmitriy Zaporozhets 5701879f73 Merge branch '7-12-rc2' into '7-12-stable' 
Fixes for RC2

we need it to make GitLab works with new CI

cc @jacobvosmaer

See merge request !1864
 2015-06-15 19:26:17 +00:00
Dmitriy Zaporozhets ddd04dec93 Fix .gitlab-ci.yml file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-15 18:41:09 +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 8fb59d3023 Dont set checkout sha for removed branch/tag 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-15 18:30:41 +02:00
Jacob Vosmaer cbeaa57a4a Version 7.12.0.rc1 v7.12.0.rc1 2015-06-12 15:11:59 +02:00
Marin Jankovski cb980c05d0 Merge branch 'update-install-docs' into 'master' 
Update install docs for 7.12

See merge request !1857
 2015-06-12 12:49:32 +00:00
Jacob Vosmaer f04134becd New source installs should use 7-12-stable 
Even though the 7-12-stable branch does not exist yet.
 2015-06-12 14:29:18 +02:00
Jacob Vosmaer d26ae29149 Install git 2.4.3 
Git 2.1.2 does not protect against pushes trying the '.Git/config'
attack (CVE-2014-9390). Going to 2.4.3 is perhaps a big jump but why not
use the latest? (Famous last words.)
 2015-06-12 14:24:22 +02:00
Dmitriy Zaporozhets e667bfe94d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-12 12:44:30 +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
Job van der Voort eeee85fbbb Merge branch 'rc1-release-doc-link' into 'master' 
Fix link to howto_rc1.md

The relative link that was there before breaks when you copy-paste the
issue template into an actual issue.

See merge request !1856
 2015-06-12 10:29:27 +00:00
Jacob Vosmaer f0ecdf5e24 Fix link to howto_rc1.md 
The relative link that was there before breaks when you copy-paste the
issue template into an actual issue.
 2015-06-12 12:09:50 +02:00
Sytse Sijbrandij 91ab3849bd Remove text since rss is now to prominent. 2015-06-12 11:58:18 +02:00
Dmitriy Zaporozhets 8949758ff3 Merge branch 'rs-expect-syntax-features' into 'master' 
Prepare feature steps for RSpec 3

See merge request !803
 2015-06-12 09:49:44 +00:00
Robert Speicher 4c42fc7c4c Call page.all instead of all in feature steps 
There's a naming conflict between Capybara and rspec-matchers which both
define the `all` method.

See https://github.com/jnicklas/capybara/issues/1396
 2015-06-12 05:12:42 -04:00
Robert Speicher 584f8601ef Change within to page.within in feature steps 2015-06-12 05:12:42 -04:00
Robert Speicher 69bbc413fe Update all should-style syntax to expect in features 2015-06-12 05:12:09 -04:00
Dmitriy Zaporozhets b07cf1182f Merge branch 'note_about_omnibus_changes' into 'master' 
Add a note that changing example configuration files requires changing omnibus-gitlab.

Keeping track of changes in these files is not easy and they usually require change in omnibus-gitlab.

Added a note so everyone is aware of this.

Similar is added to gitlab-shell and gitlab-ci.

Discussed in gitlab-org/omnibus-gitlab#605

See merge request !800
 2015-06-12 09:02:48 +00: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 11bf5b693b Fix test for accept merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-12 09:29:27 +02: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 a35aec7adb Fix merge request test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-11 22:27:26 +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
Sytse Sijbrandij e741edc2a4 Self build images require different build commands. 2015-06-11 16:17:30 +00:00
Sytse Sijbrandij 8f142c4aae Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-11 18:06:57 +02:00
Sytse Sijbrandij 8362293025 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-06-11 18:06:27 +02:00