home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,300 Commits 48 Branches 340 Tags
2de0935e276e45ac0090d32fd345593c2db92a5b
Commit Graph
18300 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Douwe Maan 2de0935e27 Merge branch 'fix-blame-lines-grouping' into 'master' 
Fix blame view line groupings

Before:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b84f75183244e58683b9172c772591d6/image.png)

After:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/12ef635deefd3616142e65f064252020/image.png)

Closes #2305

See merge request !1176
 2015-08-20 21:24:48 +00:00
Dmitriy Zaporozhets 8819007c83 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-20 14:19:32 +02:00
Dmitriy Zaporozhets 90071a08d7 Merge branch 'top-menu-improvements' into 'master' 
Navigation improvements

- [x] make explore area as part of dashboard
- [x] move navigation links from top right corner to sidebar
- [x] group navigation items on dashboard
- [x] cleanup UI after such changes
- [ ] fix tests

cc @sytses @JobV

See merge request !1177
 2015-08-20 12:18:41 +00:00
Dmitriy Zaporozhets eb057209b0 Merge pull request #9563 from Telekom-PD/feature/control-import-options 
Feature/control import options
 2015-08-20 13:46:10 +02:00
Dmitriy Zaporozhets 6a91e32af9 Cleanup groups pages UI a bit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-20 13:05:14 +02:00
Dmitriy Zaporozhets 8129e2f33f Small ui improvements to snippet page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-20 12:56:15 +02:00
Dmitriy Zaporozhets 0d8ad2dd63 Cleanup snippets index pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-20 12:48:11 +02:00
Dmitriy Zaporozhets e06e9623fd Fix test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-20 12:32:44 +02:00
Artem Sidorenko bdae9bbebd Import sources: changelog 2015-08-20 12:14:52 +02:00
Artem Sidorenko e238a8dad5 Import sources: show only enabled sources 2015-08-20 12:13:22 +02:00
Dmitriy Zaporozhets f82c14259b Rebuild navigation for dashboard 
* projects from explore page are available from dashboard
* use dashboard sidebar for both logged in and not users
* move explroe projects under projects tab
* move explore groups under groups tab
* move public snippets under snippets tab

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-20 11:59:21 +02:00
Artem Sidorenko 55dca86b98 Import sources: settings in the admin interface 2015-08-20 11:28:27 +02:00
Dmitriy Zaporozhets b1c1a3d3cc Refactor sidebar navigation for dashboard 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-20 10:59:05 +02:00
Stan Hu 0a5b005da1 Fix blame view line groupings 
Closes #2305
 2015-08-20 01:27:29 -07:00
Sytse Sijbrandij 55fc58bda4 Merge branch '2fa-message-improvement' into 'master' 
Improved 2FA warning message about lost codes

Fixes internal issue: https://dev.gitlab.org/gitlab/gitlabhq/issues/2472

The warning message now clearly states that access will be lost of the 2FA recovery codes are not saved.

/cc @sytses @JobV

See merge request !1175
 2015-08-19 23:21:02 +00:00
Patricio Cano 475bb00bde Improved 2FA warning message about lost codes 2015-08-19 18:13:01 -05:00
Douwe Maan 4df4097e32 Merge pull request #9551 from Telekom-PD/feature/search-for-archived-projects 
Feature/search for archived projects
 2015-08-19 08:53:08 -07:00
Artem Sidorenko 0719022739 Spinach tests 2015-08-19 13:47:03 +02:00
Artem Sidorenko 15cdf551fc Show colored icons like in the admin listing 2015-08-19 13:47:03 +02:00
Artem Sidorenko 10d2281d73 Show label on archived projects 2015-08-19 13:47:03 +02:00
Artem Sidorenko 3ebbed25f0 Allow listing of archived projects 
Resolves #9285
 2015-08-19 13:46:59 +02:00
Job van der Voort 3659d3b5c6 Merge branch 'security' into 'master' 
Added note about backing up recovery codes

Several people have tried to recover their 2FA codes. I think we could be more clear about it in the docs.

This is why I added a section about it at the top, so they read it before enabling them.

https://twitter.com/deathgreps/status/632006221814464512
https://twitter.com/benniemosher/status/633768429313372160

See merge request !1923
 2015-08-19 10:27:03 +00:00
Dmitriy Zaporozhets 72a425fa66 Merge branch 'remove-satellites' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-19 09:52:39 +02:00
Dmitriy Zaporozhets a3e1d7cf93 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-08-19 09:47:33 +02:00
Stan Hu e56fd693ee Merge pull request #9567 from bigsurge/bigsurge-patch-1 
add CommitNote field expose :created_at
 2015-08-19 00:23:17 -07:00
Robert Schilling 51e64356d7 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-19 09:01:46 +02:00
Robert Schilling 7f19d55c7c Time for 8.0.0.pre 2015-08-19 09:01:22 +02:00
bigsurge cecc18616a add CommitNote field expose :created_at 
add CommitNote field expose :created_at
 2015-08-19 14:29:18 +08:00
Sytse Sijbrandij a1bd164e72 Merge branch 'wip-blog-post' into 'master' 
Make sure blog post MR has WIP keyword

cc @sytses @rspeicher

See merge request !1172
 2015-08-18 23:38:42 +00:00
karen Carias b04914ab46 added note about backing up recovery codes 2015-08-18 15:56:38 -07:00
Douwe Maan 91fa82d11f Merge branch 'rs-help-path-traversal' into 'master' 
Fix path traversal in HelpController

Closes #2543

See merge request !1922
 2015-08-18 16:45:10 +00:00
Robert Speicher a42c548a8d Use File.join instead of Rails.root.join in HelpController 2015-08-18 09:08:03 -07:00
Robert Speicher 204914983a Merge branch 'fix-authhash-infinite-loop' into 'master' 
Fix infinite loop when SAML was incorrectly configured.

See merge request !1170
 2015-08-18 15:56:30 +00:00
Robert Speicher 04e1c4d3da Merge branch 'fix-rake-info' into 'master' 
Fix gitlab:env:info rake task.

Found doing QA.

See merge request !1169
 2015-08-18 15:47:38 +00:00
Dmitriy Zaporozhets 89beb39fcc Make sure blog post MR has WIP keyword 2015-08-18 14:46:01 +00:00
Stan Hu 2b127c3fd2 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-18 06:46:44 -07:00
Dmitriy Zaporozhets 798f2fe19f Merge branch 'mr-source-branch-clear-cache' into 'master' 
Clear cache to prevent listing deleted branches after MR removes source branch

Closes #2272

See merge request !1160
 2015-08-18 13:16:46 +00:00
Stan Hu cc871c0c74 Merge pull request #9564 from bbodenmiller/robots.txt 
disallow irrelevant pages by defaults in robots
 2015-08-18 03:43:39 -07:00
Stan Hu adebf70220 Merge pull request #9436 from bbodenmiller/patch-4 
capitalize URL in "Home page URL"
 2015-08-18 03:43:22 -07:00
Ben Bodenmiller 692e381e0c capitalize URL in "Home page URL" 2015-08-17 23:16:18 -07:00
Ben Bodenmiller 595a93ee2c disallow irrelevant pages by default in robots 
Update default robots.txt rules to disallow irrelevant pages that search
engines should not care about. This will still allow important pages
like the files, commit details, merge requests, issues, comments, etc.
to be crawled.
 2015-08-17 23:11:16 -07:00
Stan Hu 2a704396fb Fix incorrect CHANGELOG version 2015-08-17 19:29:06 -07:00
Stan Hu 5fad0b585e Merge branch 'bump-gitlab-git' into 'master' 
Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules

Closes #2262

See merge request !1171
 2015-08-18 00:48:49 +00:00
Stan Hu 47d55306d9 Upgrade gitlab_git to 7.2.14 to ignore CRLFs in .gitmodules 
Closes #2262
 2015-08-17 23:56:02 +00:00
Douwe Maan 262c6f11fe Merge branch 'rs-remove-gfm_with_options' into 'master' 
Remove the `gfm_with_options` helper

It was redundant because `gfm` also took options.

See merge request !1152
 2015-08-17 23:42:29 +00:00
Douwe Maan c16b1651f5 Fix infinite loop when SAML was incorrectly configured. 2015-08-17 16:39:22 -07:00
Douwe Maan c9920c422d Merge branch 'fix-backslashes-inline-diff' into 'master' 
Fix bug where backslashes in inline diffs could be dropped

This MR fixes a bug in inline diff generation causing backslashes to be dropped. For example, the input:

```
input.to_s.sub(/[\r\n].+/,'').sub(/\\[rn].+/, '').strip
```

The second backslash is dropped in the second `sub` statement:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/16e513894f7ecda1b111fe7d43e7f388/image.png)

With this fix, it looks like:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/90fd635a937a68f1b2403740ebc75e3a/image.png)

Closes #2253

See merge request !1143
 2015-08-17 23:33:36 +00:00
Douwe Maan f4cb6e438a Merge branch 'code-import-error-ui-improvements' into 'master' 
Improve error message display when project fails to import

Follow-up to !1134.

New screenshot:

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/c1a8ffa30ab3b78010e16cf65c2ff438/image.png)

See merge request !1138
 2015-08-17 23:31:51 +00:00
Dmitriy Zaporozhets 1e73e5dc14 Merge pull request #9565 from gitlabhq/revert-9528-Fixed_alignment_issue 
Revert "Fix for #9527"
 2015-08-17 18:30:21 +02:00
Dmitriy Zaporozhets 50696ce1d3 Revert "Fix for #9527" 2015-08-17 18:29:54 +02:00