home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,527 Commits 48 Branches 340 Tags
f7d0932d2e001728b6e00a2bdd222a802f0c180f
Commit Graph
18527 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets f7d0932d2e Improve wording for approve comment 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-13 10:40:03 +02:00
Dmitriy Zaporozhets 80e30a9262 Add system note when user approves merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-12 16:18:40 +02:00
Dmitriy Zaporozhets 07703c22b3 Improve approve MR widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-12 16:00:25 +02:00
Dmitriy Zaporozhets 33dce2df6f Merge branch 'ce-to-ee' into 'master' 
CE to EE

See merge request !419
 2015-06-12 12:59:48 +00:00
Dmitriy Zaporozhets 89ac4f1d56 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	features/steps/project/project.rb
 2015-06-12 14:01:20 +02:00
Dmitriy Zaporozhets 9b53b20a04 Merge branch 'ad-block-doc' into 'master' 
Imporove LDAP documentation

If user was blocked in Active Directory - user will be automatically blocked in GitLab during next Daily sync.

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

Fixes gitlab/gitlabhq#2126 as part of gitlab/gitlab-ee#248 (https://dev.gitlab.org/gitlab/gitlab-ee/issues/248#note_40033)

cc @haydn @marin

See merge request !420
 2015-06-12 11:53:37 +00:00
Dmitriy Zaporozhets 7ff669a769 Fix tests for EE after CE merge 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-12 13:49:15 +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
Dmitriy Zaporozhets 896eb0aa13 Imporove LDAP documentation 
If user was blocked in Active Directory - user will be automatically blocked in GitLab during next Daily sync.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-12 12:15:08 +02: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
Dmitriy Zaporozhets f840903112 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/helpers/tab_helper.rb
	app/models/merge_request.rb
	app/views/layouts/nav/_project_settings.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	doc/api/groups.md
 2015-06-12 11:16:28 +02: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
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 7bf9dcafd3 Merge branch 'approves-docs' into 'master' 
Documentation for approves feature

See merge request !418
 2015-06-11 14:55:29 +00:00
Dmitriy Zaporozhets 491dc6506f Documentation for approval feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-11 16:06:57 +02:00
Dmitriy Zaporozhets 9322e52432 Always show approvers list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-11 15:46:57 +02: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
Job van der Voort 7872c7ff62 fix and minify images 2015-06-11 15:12:47 +02:00
Marin Jankovski df346e9507 Add a note that changing example configuration files requires changing omnibus-gitlab. 2015-06-11 15:11:37 +02:00
Job van der Voort a042b0ab83 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-11 15:04:53 +02:00
Job van der Voort bd503e5a4e Merge branch 'fix-importing-docs' into 'master' 
move and fix links importing docs

See merge request !1852
 2015-06-11 12:47:23 +00:00
Job van der Voort 9a4886f0a0 move and fix links importing docs 2015-06-11 14:45:48 +02:00