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,931 Commits 48 Branches 340 Tags
c435af50b1c0b995a35f5dc4d5adb57700a52c27
Commit Graph
17931 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets c435af50b1 Merge branch 'rs-issue-2356' into 'master' 
Show "Remove logo" buttons only when Appearance settings are persisted

This also adds the CarrierWave cache fields to the form as recommended by https://github.com/carrierwaveuploader/carrierwave#making-uploads-work-across-form-redisplays so that uploaded files aren't lost between form submits (i.e., when there are errors on the form).

See gitlab/gitlabhq#2356

See merge request !410
 2015-06-02 16:35:07 +00:00
Marc Radulescu 3963d31041 fix typo 2015-06-01 08:52:00 +00:00
Robert Speicher d1bca53bcf Show "Remove logo" buttons only when Appearance settings are persisted 
This also adds the CarrierWave cache fields to the form as recommended
by https://github.com/carrierwaveuploader/carrierwave#making-uploads-work-across-form-redisplays
so that uploaded files aren't lost between form submits (i.e., when
there are errors on the form).
 2015-05-30 18:23:24 -04:00
Job van der Voort 9bc8743080 Merge branch 'fixing_doc_name' into 'master' 
Fixing name for "branded login page"

I think that it would be easier to find this document with the name "Changing the appearance of the login page". I added the change to the doc and to the link.

See merge request !408
 2015-05-28 15:11:50 +00:00
Marin Jankovski f07b26fcef Merge branch 'chlg-update' into 'master' 
update changelog for 7.11.4

See merge request !409
 2015-05-28 10:38:22 +00:00
Job van der Voort da2a2a6ec8 update changelog for 7.11.4 2015-05-28 11:10:26 +02:00
Karen Carias a574e935fc fixed description 2015-05-27 18:48:33 +00:00
Karen Carias b7818f1965 fixed name on link to make it easier to find 2015-05-27 18:46:57 +00:00
Karen Carias 8a0221c7bd changed the document name to make it more useful 2015-05-27 18:44:47 +00:00
Jacob Vosmaer 9bfc23c3f1 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee 2015-05-27 15:44:14 +02:00
Dmitriy Zaporozhets 6e2d69c9af Merge branch 'help-page-dark' into 'master' 
Render "Enterprise Edition" on help page with dark font.

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

See merge request !3
 2015-05-27 11:48:05 +00:00
Dmitriy Zaporozhets c0d8312193 Merge branch 'extract-closing-issues' into 'master' 
Fix error when viewing merge request with a commit that includes "Closes #<issue id>".

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/488 was giving a 500 error, and the logs showed this was the error.

I'm not yet sure why project would be `nil` in this case, but that's another issue.

cc @rspeicher

See merge request !2
 2015-05-27 11:47:48 +00:00
Douwe Maan 0d02b794c4 Merge branch 'git_annex_fix' into 'master' 
Fix leftover user checks for git_annex after refactoring

Fixes #291

See merge request !404
 2015-05-26 09:51:37 +00:00
Douwe Maan f58b17e20a Render "Enterprise Edition" on help page with dark font. 2015-05-25 17:15:03 +02:00
Douwe Maan 632a0c548d Check if project is nil in reference extractor. 2015-05-25 12:45:07 +02:00
Patricio Cano 1d3435d68f Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee 2015-05-22 18:11:46 -05:00
Patricio Cano 91b0980a1c Added 7.11.2 to the CHANGELOG 2015-05-22 18:07:36 -05:00
Sytse Sijbrandij fab298d685 Fix download location 2015-05-22 21:36:00 +00:00
Sytse Sijbrandij 44506f06b0 Link to new locations. 2015-05-22 19:01:12 +00:00
Marin Jankovski c490430f55 Fix leftover user checks for git_annex after refactoring 2015-05-22 14:46:44 +02:00
Job van der Voort 18cbfd829b Merge branch 'define_users' into 'master' 
Added info about active users

Added a small definition for users in EE, based on Tweet
https://twitter.com/SeanSith/status/595386784760082432

See merge request !403
 2015-05-22 07:22:48 +00:00
Karen Carias 51d6aa1351 Added info about active users 2015-05-21 22:48:20 +00:00
Job van der Voort 4e54a7e54f Merge branch 'validate-user-count-before-issue-date' into 'master' 
Validate maximum active user count up until license issue date.

Step 1 of #298

cc @sytse @job

See merge request !402
 2015-05-21 18:32:26 +00:00
Douwe Maan bf29e33d5d Rename issued_at to starts_at. 2015-05-21 19:50:57 +02:00
Douwe Maan fda2b5adae Only look at year before license was issued. 2015-05-21 19:15:43 +02:00
Douwe Maan d180f40400 Validate maximum active user count up until license issue date. 2015-05-21 18:49:24 +02:00
Job van der Voort 064170d3c1 Merge branch 'dl-info' into 'master' 
update download info

See merge request !398
 2015-05-20 12:30:10 +00:00
Job van der Voort bb4761d826 update download info 2015-05-20 13:05:07 +02:00
Job van der Voort 4ecaf57301 Merge branch 'ce-to-ee' into 'master' 
CE to EE

Fixes gitlab/gitlabhq#2330

See merge request !396
 2015-05-15 11:36:05 +00:00
Job van der Voort 4fe6b3d7e8 Merge branch '7-11-guides' into 'master' 
Update installation/update guides for 7.11.

See merge request !397
 2015-05-15 11:20:35 +00:00
Douwe Maan 2ff2f5bf6e Update installation/update guides for 7.11. 2015-05-15 13:13:09 +02:00
Dmitriy Zaporozhets 1af8b1e4f8 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/views/help/index.html.haml
	lib/gitlab/git_access.rb
	public/500.html
	public/502.html
 2015-05-15 13:29:58 +03:00
Dmitriy Zaporozhets be969bb4de Merge branch 'fix-653' into 'master' 
Fix push event.

Fixes issue with !653.

See merge request !663
 2015-05-15 10:12:33 +00:00
Douwe Maan ac3d472ff4 Fix push event. 2015-05-15 12:11:16 +02:00
Dmitriy Zaporozhets 07fd736d2e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-15 12:59:44 +03:00
Dmitriy Zaporozhets 9c6f4a2351 Merge branch 'dashboard-references' into 'master' 
Fix reference links in dashboard activity and ATOM feeds.

References like `@user` were not linked on the dashboard activity feed and in Atom feeds, because the reference parser depends on `@project` which isn't set in those situations.

This MR passes the project in question to the reference parsers in an option.

cc @rspeicher

See merge request !653
 2015-05-15 09:59:26 +00:00
Dmitriy Zaporozhets de1aca131e Merge branch 'spinner-spin' into 'master' 
Spin icon next to "Checking for CI status..."

Stationary spinners make me sad.

See merge request !655
 2015-05-15 09:57:24 +00:00
Dmitriy Zaporozhets 3b4c0ea06f Merge branch 'use-count-badges' into 'master' 
Use count badges with number_with_delimiter helper for issue, commit count

See merge request !658
 2015-05-15 09:56:56 +00:00
Jeroen van Baarsen 735fbb43ed Merge pull request #9296 from jorgevbo/master 
Fix bug with default timezone en RSS gitlab events
 2015-05-15 11:36:40 +02:00
Dmitriy Zaporozhets a13e6f13c7 Fix gemfile.lock 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-15 08:57:20 +03:00
Dmitriy Zaporozhets e54ff51aca Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-14 23:26:44 +03:00
Dmitriy Zaporozhets 740dc41250 Merge branch 'project_api_order' into 'master' 
Add order option for projects API

https://dev.gitlab.org/gitlab/gitlab-ci/issues/222

See merge request !656
 2015-05-14 20:25:39 +00:00
Dmitriy Zaporozhets aa4f085184 Merge branch 'rs-refactor-2fa' into 'master' 
Refactor SessionsController to use a controller concern

See merge request !659
 2015-05-14 20:23:30 +00:00
Dmitriy Zaporozhets 21b10d61a1 Merge branch 'rs-ldap-2fa' into 'master' 
Enable 2FA for LDAP logins

See merge request !395
 2015-05-14 20:22:20 +00:00
Jorge Vasquez dfb58234a1 Fix bug with default timezone en RSS gitlab events 2015-05-14 15:30:55 -04:00
Robert Speicher 0ad9fc60ec Enable 2FA for LDAP logins 2015-05-14 14:45:31 -04:00
Robert Speicher c802d8eee1 Refactor SessionsController to use a controller concern 2015-05-14 14:24:05 -04:00
Douwe Maan 37bc4bb199 Merge branch 'fix-blob-path' into 'master' 
Fix broken view when viewing history of a file that includes a path that used to be another file

Requires gitlab_git to v7.1.12 to be tagged and released.

Closes #1598

See merge request !651
 2015-05-14 17:47:23 +00:00
Jeroen van Baarsen e1982c3288 Merge pull request #9295 from afc163/master 
Add style for <kbd> element in markdown
 2015-05-14 19:41:43 +02:00
afc163 2738978111 Add style for <kbd> element in markdown 
Fixes #5825
 2015-05-14 23:57:01 +08:00