home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 18:16:45 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,927 Commits 48 Branches 340 Tags
8eadfd2df76802b02b4d47792acadd5276ca2e2c
Commit Graph
16927 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Stan Hu bbb4aa5317 Update browser gem to version 0.8.0 for IE11 support 
Closes #1775
 2015-06-09 15:27:40 -07: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
Karen Carias fc9d90c379 fixed numbers 2015-06-08 20:35:53 +00:00
Karen Carias e150ab9cee Added info about milestones and wiki pages not imported from Bitbucket 2015-06-08 20:31:02 +00:00
Karen Carias ce7831ae39 fixed importing link 2015-06-08 20:26:58 +00:00
Dmitriy Zaporozhets b637f84950 Fix broadcast message colors to one displayed in preview 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 20:39:02 +02:00
Dmitriy Zaporozhets ec99074cbf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-08 19:42:23 +02:00
Dmitriy Zaporozhets 0944dd4384 Merge branch 'improve-navigation' into 'master' 
Improve GitLab UI

* move logout button to top right

![Screenshot_2015-06-08_16.56.13](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7de04fab52ad6b742dbea100674f9671/Screenshot_2015-06-08_16.56.13.png)

* remove issue/mr title truncation on index pages. For smaller screens it allow to read complete title of issue

![Screenshot_2015-06-08_16.57.55](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9dcaadfba14f8561c12fcd29a2e70112/Screenshot_2015-06-08_16.57.55.png)

* Improve mobile UI for several pages

See merge request !783
 2015-06-08 17:41:36 +00:00
Dmitriy Zaporozhets 5b4ab5a0ca Properly click on user profile picture 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 18:20:00 +02:00
zenati c418261b2b No need to check if repository_ref is present 
There is no need to check if `repository_ref` is present as:
```
      @repository_ref = if repository_ref.present?
                          repository_ref
                        else
                          nil
                        end
```

is as same as doing:

```
@repository_ref = repository_ref
```
 2015-06-08 18:01:50 +02:00
Dmitriy Zaporozhets 8ee57adc8a Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 17:29:27 +02:00
Dmitriy Zaporozhets 78d4b6ae8d Remove arrow to the right of project name on dashboard 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 17:27:50 +02:00
Dmitriy Zaporozhets d46d6fc17b Improve UI for phones 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 16:54:39 +02:00
Job van der Voort 64627e7929 Merge branch 'importing-fix' into 'master' 
importing documents renewed

Single commit of !1813

cc @karen

See merge request !1844
 2015-06-08 14:50:53 +00:00
Job van der Voort b368d4a1d1 fix spacing in document 2015-06-08 16:37:04 +02:00
Job van der Voort 8a32c46e6e importing documents renewed 2015-06-08 16:35:03 +02:00
Dmitriy Zaporozhets 8641cda4a5 Dont use fixed pixel size if form controls - its bad for mobile devices 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 16:34:58 +02:00
Dmitriy Zaporozhets ebaa1e5a89 Fix header for mobiles 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 16:34:07 +02:00
Dmitriy Zaporozhets 9b77a4baf9 Dont truncate issue/mr title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 16:33:33 +02:00
Dmitriy Zaporozhets 61a3cd6351 Move logout buttom to top right corner 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-08 15:50:26 +02:00