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
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
Sytse Sijbrandij 7415a1a33c Merge branch 'update-oauth-button-logos' into 'master' 
Update oauth button logos for Twitter and Google

Both new buttons are 64x64 renders of the recommended assets
from each company.

Refs for those recommendations are:

 - https://about.twitter.com/press/twitter-brand-policy
 - https://developers.google.com/identity/branding-guidelines

Closes issue #544

[ci skip]

Sign in UI before:

![sign-in-buttons-before](https://gitlab.com/fmborghino/gitlab-ce/uploads/ed42a056b23eb6db3907cb604a865ce5/sign-in-buttons-before.png)

Sign in UI after:

![sign-in-buttons-after](https://gitlab.com/fmborghino/gitlab-ce/uploads/c7fb1d996fa744274298e195799bc033/sign-in-buttons-after.png)

See merge request !798
 2015-06-11 12:12:53 +00:00
Dmitriy Zaporozhets 644b6ba993 Refactor accept merge request widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-11 09:40:26 +02:00
Max Borghino a37ff6de88 Update oauth button logos for Twitter and Google 
Both new buttons are 64x64 renders of the recommended assets
from each company.

Refs for those are:

 - https://about.twitter.com/press/twitter-brand-policy
 - https://developers.google.com/identity/branding-guidelines

Addresses issue #544
 2015-06-10 23:48:06 -07:00
themaze75andEric Maziade 1d080f5745 session_expire_seconds => session_expire_delay 
delay is in seconds
more legible code in session_store
Added `GitLab restart required` help block to session_expire_delay
 2015-06-10 22:10:00 -04:00
Douwe Maan 3de35168fd Merge branch 'project_settings_icons_alignment' into 'master' 
Fix alignment of Project Settings nav icons.

@douwe thanks for reviewing this small fix.

![before_after](https://dev.gitlab.org/gitlab/gitlabhq/uploads/ce213aa5b08c640ec5e9b018e0ec4036/before_after.png)

See merge request !1848
 2015-06-10 21:16:19 +00:00
Robert Speicher fbdcaebcd1 Fix "Acount" typo in 2FA docs 
[ci skip]
 2015-06-10 17:11:04 -04:00
Robert Speicher 42ca87ebf7 Add negative tabindex to Markdown Write and Preview tabs 
Closes #1757
 2015-06-10 16:34:51 -04:00
Robert Speicher e26eb1e162 Update grids for 2FA details 
Also adds a link to the documentation.
 2015-06-10 16:31:06 -04:00
Karen Carias 41a21912c6 added links to API calls 2015-06-10 17:07:55 +00:00
Dmitriy Zaporozhets 190c9e9f39 Merge branch 'fix-project-edit' into 'master' 
Improve project edit form

Properly align checkboxes according to bootstrap

Before:

![Screenshot_2015-06-10_17.01.26](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2e874cc0a6edd52d98a17030f3d16f24/Screenshot_2015-06-10_17.01.26.png)

After:

![Screenshot_2015-06-10_16.59.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7d91ffe8e981f9bc57d9a18ce8ac79e2/Screenshot_2015-06-10_16.59.31.png)

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

See merge request !793
 2015-06-10 15:33:45 +00:00
Dmitriy Zaporozhets 3620849018 Improve project edit form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-10 17:01:06 +02:00
Dmitriy Zaporozhets e407a481f2 Merge branch 'rs-pre-rspec-3' into 'master' 
Changes back-ported from rspec3 branch

This is just breaking up the large `road-to-rspec-3` branch a bit. Each of these commits have been cherry-picked and would be good to have in place before the upgrade.

See merge request !792
 2015-06-10 14:04:12 +00:00
Dmitriy Zaporozhets 5a9135ade8 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-10 14:31:13 +02:00
Dmitriy Zaporozhets 8eadfd2df7 Merge branch 'master' into 'master' 
update fog to 1.25.0 and add multipart upload support

This merge will fix backup uploading problems to s3, closing gitlab-org/gitlab-ce#1059

See merge request !789
 2015-06-10 12:30:44 +00:00
Job van der Voort 5ed68826b6 Merge branch 'fixing-links' into 'master' 
fixed links

@job I am trying to fix these links, since they work on the commit, but then they didn't work on the website when the commit was merged.

I tried changing them here, but I'm not sure if they'll work when merged. I tried to use localhost to test this, but it only works with www-gitlab-com

Thanks!

See merge request !1849
 2015-06-10 09:17:08 +00:00
Robert Schilling 671398e739 Merge branch 'bump-browser-gem-version-for-ie11' into 'master' 
Update browser gem to version 0.8.0

Internet Explorer 11.0.9600.17633 has a new User-Agent string (tested using [BrowserStack](https://www.browserstack.com)):

```
User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko
```

This is supported in v0.8.0 of the browser gem:

https://github.com/fnando/browser/commit/aab7a81d94cc2c31c4b860fa4a9b9a361adf1bab

Closes #1775

See merge request !791
 2015-06-10 05:45:31 +00:00
Robert Speicher 94cbf0091f Fix taskable require 2015-06-10 01:38:45 -04:00
Robert Speicher 11c611bc62 Fix shoulda-matchers require 2015-06-10 01:38:36 -04:00
Robert Speicher 700d4387ce Use stub_const to stub constants instead of redefining them 
They're called constants for a reason, after all.
 2015-06-10 01:31:27 -04:00
Robert Speicher 1f9a2ab7c9 Memoize result of JSON.parse in json_response 
This might see a minor speedup in test cases that call this method many
times.
 2015-06-10 01:31:27 -04:00
Robert Speicher 33df3ed384 Add respond_to_missing? for Commit and Repository 
As of Ruby 1.9, this is the correct way to handle `respond_to?` for
methods implemented by `method_missing`.

See https://robots.thoughtbot.com/always-define-respond-to-missing-when-overriding
 2015-06-10 01:31:27 -04:00
Robert Speicher 57830201a9 Add spec/support files for WebMock and test coverage 2015-06-10 01:31:27 -04:00
Robert Speicher 2f3ab0ab85 Define GITORIOUS_HOST only once 2015-06-10 01:31:27 -04:00
Robert Speicher 1c4604bff6 "expect { }.not_to raise_error" no longer takes a specific class 2015-06-10 01:31:27 -04:00
Robert Speicher 47251b85e0 ensure_length_of -> validate_length_of 2015-06-10 01:31:26 -04:00
Robert Speicher 07215f7f2a Bump shoulda-matchers and webmock gem versions 2015-06-10 01:31:26 -04:00
Karen Carias fd9849ebba fixed links 2015-06-10 03:19:40 +00:00
Nicolas e34c1169a5 Fix alignment of Project Settings nav icons. 2015-06-10 00:43:07 +02:00
Stan Hu bbb4aa5317 Update browser gem to version 0.8.0 for IE11 support 
Closes #1775
 2015-06-09 15:27:40 -07:00
Sytse Sijbrandij 3d219ca395 Merge branch 'release-time' into 'master' 
set the release time

See merge request !1843
 2015-06-09 19:55:50 +00:00
Dmitriy Zaporozhets 269c2d2efc Merge branch 'move_project_members_link' into 'master' 
Move Project Members link from Settings to main menu.

Addresses #2278.

See merge request !1846
 2015-06-09 18:23:35 +00:00
Dmitriy Zaporozhets ec39b21c89 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-09 20:19:07 +02:00
Dmitriy Zaporozhets 5e8c6e6d71 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-06-09 20:18:19 +02:00
Jeroen Nijhof a7047569db use gitlab not gitlabci 2015-06-09 18:30:38 +02:00
Jeroen Nijhof cd522f3309 remove extra space 2015-06-09 17:59:08 +02:00
Jeroen Nijhof bf7315cb13 update fog to 1.25.0 and add multipart upload support 2015-06-09 17:56:37 +02:00
Douwe Maan 3c5b2a99df Merge pull request #9373 from gitlabhq/revert-9368-patch-1 
Revert "No need to check if `repository_ref` is present"
 2015-06-09 15:23:16 +02:00
Jeroen van Baarsen 25a870a6d4 Revert "No need to check if repository_ref is present" 2015-06-09 15:18:15 +02:00
Nicolas ebe4963871 Move Project Members link from Settings to main menu. 
Addresses #2278.
 2015-06-09 14:45:38 +02:00
zenati b0de6e9ae2 An in_namespace scope is already present 2015-06-09 13:42:01 +02:00
Douwe Maan 356bafcbb4 Merge branch 'fix_edit_notes_form_hotkey_issue' into 'master' 
Make submit hotkey available to all notes forms.

Addresses #2221.

See merge request !1847
 2015-06-09 11:13:42 +00:00
Dmitriy Zaporozhets 6267a6b999 Merge branch 'ldap-remember-me' into 'master' 
Add "Remember me" checkbox to LDAP signin form.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2127.

See merge request !772
 2015-06-09 10:52:30 +00:00
Dmitriy Zaporozhets 9562f02859 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-09 12:40:00 +02:00
Dmitriy Zaporozhets 4e9de95221 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-06-09 12:39:45 +02:00
Dmitriy Zaporozhets 18e33e037f Merge branch 'fix-missing-js' into 'master' 
Move page-specific JS out of head and into body.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2375.

See merge request !787
 2015-06-09 10:39:10 +00:00