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
16,947 Commits 48 Branches 340 Tags
644b6ba993ce033369bc50642caed69f3bed7f8a
Commit Graph
16947 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Dmitriy Zaporozhets 378904d628 Merge branch 'rs-issue-1778' into 'master' 
Correctly remove already-mentioned commits for cross references

Fixes #1778

See merge request !785
 2015-06-09 10:08:04 +00:00
Douwe Maan eb80edd34f Move page-specific JS out of head and into body. 2015-06-09 12:01:18 +02:00
Job van der Voort fbe1ca39aa Merge branch 'fixing_importing_doc' into 'master' 
Fixing importing doc

Fixed some details about the importing links and documents.

- Added extra info to Bitbucket importing
- Organized docs in alphabetical order
- Moved Importing link to general documentation, instead of workflow (that's where Sytse asked me to add it)

Thank you @job for merging previous changes.

See merge request !1845
 2015-06-09 07:01:50 +00:00
Job van der Voort 4d6a338cc4 Merge branch 'master' into 'master' 
Added line about adding docs in alphabetical order

I believe it's important to be organized when adding documentation, so whenever it applies, I believe documents should be added in alphabetical order.

See merge request !786
 2015-06-09 06:59:23 +00:00
Jeroen van Baarsen 199b93387b Merge pull request #9368 from zenati/patch-1 
No need to check if `repository_ref` is present
 2015-06-09 08:58:48 +02:00
Nicolas a68eabd212 Make submit hotkey available to all notes forms. 
Addresses #2221.
 2015-06-09 05:31:21 +02:00
Karen 42201b150d Added line about adding docs in alphabetical order 2015-06-08 22:28:41 +00:00
Robert Speicher 23954b0f77 Correctly remove already-mentioned commits for cross references 
Fixes #1778
 2015-06-08 18:13:14 -04:00
Karen Carias ed42be4019 fixed link 2015-06-08 21:03:57 +00:00
Karen Carias 732828b7bb fixed link 2015-06-08 21:03:15 +00:00
Karen Carias 60ac9253ad fixed link 2015-06-08 21:01:56 +00:00
Karen Carias b4116e76cb Removed link "importing to gitlab" because it's in "Documentation". Organized links in alphabetical order. 2015-06-08 20:55:42 +00:00
Karen Carias 0ea9c962a4 added link to "importing to GitLab". Also organized docs in alphabetical order. 2015-06-08 20:48:06 +00:00
Karen Carias 44aaf40ad3 fixed numbers 2015-06-08 20:37:28 +00:00
Karen Carias 0c538cd8b5 fixed numbers 2015-06-08 20:36:28 +00:00