home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Speicher 821fc4b034 Add Profiles::PreferencesController 2015-06-13 17:58:15 -04:00
Robert Speicher 27a8d84094 Update Redcarpet to 3.3.0 
Fixes #1432
 2015-06-13 17:54:54 -04:00
Dmitriy Zaporozhets 0b3c974221 Merge branch 'rs-issue-1798' into 'master' 
Ensure `session_expire_delay` field exists before accessing it

Closes #1798

See merge request !808
 2015-06-13 09:01:01 +00:00
Robert Speicher 567a25b630 Ensure session_expire_delay field exists before accessing it 
Closes #1798
 2015-06-13 00:31:08 -04:00
Dmitriy Zaporozhets 0a03b9b717 Remove visibility icon from projects list on dashboard and group page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-12 18:16:19 +02:00
Sytse Sijbrandij 89b56c81d0 Merge branch 'regex-anchor-docs' into 'master' 
Add info about regex anchors to shell command docs.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlab-ee/issues/263.

See merge request !805
 2015-06-12 14:40:02 +00:00
Douwe Maan 313438b327 Add info about regex anchors to shell command docs. 2015-06-12 16:17:04 +02:00
Stan Hu d45112258e Fix post-receive errors on a push when an external issue tracker is configured 
Closes #1700
Closes #1720
 2015-06-12 06:59:27 -07:00
Douwe Maan 9ea8dcb5e2 Merge branch 'feature-session-expire-seconds-ui' into 'master' 
Add session expiration delay configuration through UI application

Setting is accessible by the administrator through the UI and defaults to 1 week (the current setting)

Answers the following suggestions:

  * http://feedback.gitlab.com/forums/176466-general/suggestions/6210719-make-session-length-configurable
  * http://feedback.gitlab.com/forums/176466-general/suggestions/6730512-automatic-logout-after-a-time-being-idle

See merge request !774
 2015-06-12 13:50:40 +00:00
Jacob Vosmaer c14de4fd28 Merge branch 'update-guides-7.12' into 'master' 
Add 7.12 update guides

See merge request !1858
 2015-06-12 13:34:50 +00:00
Jacob Vosmaer 5019a7f314 Move mention of git 2.1.2 to intro paragraph 2015-06-12 15:32:43 +02:00
Jacob Vosmaer 6ec4da5d01 Add 7.12 update guides 2015-06-12 15:24:11 +02:00
Douwe Maan e9c40a9c0f Merge branch 'fix_typo_account_page' into 'master' 
Fix typo on account page.

@douwe Thanks for reviewing this small fix.

See merge request !1854
 2015-06-12 13:16:31 +00: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
Nicolas c2087098be Fix typo on account page. 2015-06-12 05:15:11 +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
Sytse Sijbrandij 0b09436d67 Merge pull request #9382 from stefan-it/stefan/docker-documentation-fx 
[Docker][Documentation] Uses correct docker image from Docker Hub
 2015-06-11 18:05:43 +02:00
Stefan Schweter e77b20872e [Docker][Documentation] Uses new docker data image from Docker Hub (*sytse/gitlab-data*). Uniform tag name for data image is now *gitlab-data*. 2015-06-11 17:44:12 +02:00
Job van der Voort a7a4ae69d4 Merge branch 'info_about_namespaces' into 'master' 
Info about namespaces

Added info about namespaces in groups.

Because of tweet https://twitter.com/kaystrobach/status/603912904757420032

See merge request !1835
 2015-06-11 15:21:28 +00: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
Job van der Voort 9735580188 Merge branch 'fix-importing-docs' into 'master' 
fix and minify images

See merge request !1853
 2015-06-11 13:13:31 +00:00