home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,904 Commits 48 Branches 340 Tags
4e9de9522158e55a2e430c83c2968936f5bbc511
Commit Graph
16904 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 4e9de95221 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-06-09 12:39:45 +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
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
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
Sytse Sijbrandij 509fe1159a Merge branch 'master' into 'master' 
Doc: Added FreeOTP to 2FA

I have just added a note about a free alternative to Google Authenticator to the documentation of your two factor authentication.

See merge request !777
 2015-06-06 13:11:01 +00:00
rugk 975d110688 Changed spelling 2015-06-06 12:34:40 +00:00
Dmitriy Zaporozhets e73d7b6766 Merge branch 'cleaner-project-page' into 'master' 
Remove line under project description

## Before

![Screenshot_2015-06-05_19.44.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e80e03a15ff32de489e61662674f8b70/Screenshot_2015-06-05_19.44.39.png)

## After

![Screenshot_2015-06-05_19.44.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d4e2eb43802dbeee397fb6bc051b82b2/Screenshot_2015-06-05_19.44.19.png)

See merge request !776
 2015-06-05 18:32:23 +00:00
Dmitriy Zaporozhets 354b6f1cd3 Remove line under project description 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 19:50:23 +02:00
Jacob Vosmaer 0678e9acca Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-05 19:24:14 +02:00
Jacob Vosmaer 7c09da9e8f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-06-05 19:23:38 +02:00
Jacob Vosmaer 0e8296fd56 Make unicorn docs discoverable 2015-06-05 19:23:10 +02:00
Dmitriy Zaporozhets 7880450e8e Merge branch 'header-50-px' into 'master' 
Fix css alignment in header. Use scss variable

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

See merge request !775
 2015-06-05 17:08:05 +00:00
Dmitriy Zaporozhets 2d5165979f Fix css alignment in header. Use scss variable 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 18:49:00 +02:00
Dmitriy Zaporozhets b6aa7cbccd Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-05 18:19:17 +02:00
Dmitriy Zaporozhets 87f9c475db Merge branch 'refactor-web-editor' into 'master' 
Refactor web editor

* fix problem with editing non-master branch
* before commit make sure branch exists
* dont allow user change file in one branch and commit to another existing branch
* remove a lot of code duplication
* remove outdated statellite errors

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

Fixes #1761

See merge request !773
 2015-06-05 16:14:34 +00:00
Dmitriy Zaporozhets 7bde6ae540 Fix editing files via API 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 17:16:51 +02:00
Sytse Sijbrandij 01cd7d2c2a Improve instructions for publishing gitlab-app. 2015-06-05 14:15:15 +00:00
Dmitriy Zaporozhets 5a026152b7 Merge branch 'warn-about-referenced-users' into 'master' 
Show warning when a comment will add 10 or more people to the discussion.

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

New issue:

![Screen_Shot_2015-06-02_at_14.48.46](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6771ff8748b9b548a9f0f32a5a8b9bb1/Screen_Shot_2015-06-02_at_14.48.46.png)

New comment:

![Screen_Shot_2015-06-02_at_14.48.51](https://gitlab.com/gitlab-org/gitlab-ce/uploads/25ec5f06490e1e6b36e453e055a7b403/Screen_Shot_2015-06-02_at_14.48.51.png)

See merge request !754
 2015-06-05 13:37:08 +00:00
Dmitriy Zaporozhets 6f7bf4e4f0 Merge branch 'wip-mr-docs' into 'master' 
Add info about WIP merge requests to docs.

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

See merge request !770
 2015-06-05 13:35:16 +00:00
Dmitriy Zaporozhets 3b9792ec72 Merge branch 'fix-long-blob-timeout' into 'master' 
Fix timeout when rendering file with thousands of lines.

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

See merge request !771
 2015-06-05 13:34:16 +00:00
rugk 507ebb701a Escaped(?) 2015-06-05 13:18:05 +00:00
rugk 193f019f61 Added free alternative to Google Authenticator (FreeOTP). 2015-06-05 13:16:47 +00:00
Job van der Voort ef7c0945c3 Merge branch 'understanding-unicorn' into 'master' 
Try to explain Unicorn and unicorn-worker-killer

See merge request !1842
 2015-06-05 13:12:32 +00:00
Dmitriy Zaporozhets dfccb06dda Refactor web editor 
* fix problem with editing non-master branch
* before commit make sure branch exists
* dont allow user change file in one branch and commit to another existing branch
* remove a lot of code duplication
* remove outdated statellite errors

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 15:01:38 +02:00
Jacob Vosmaer d98bcb9ca9 Try to explain Unicorn and unicorn-worker-killer 2015-06-05 14:23:35 +02:00
Douwe Maan 9a50db693a Fix timeout when rendering file with thousands of lines. 2015-06-05 13:56:37 +02:00