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
8,146 Commits 48 Branches 340 Tags
32b9ec50dddb8a82ffceefe17c4cc6fbaacc1ed4
Commit Graph
8146 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 32b9ec50dd Merge branch 'architecture' into 'master' 
Architecture

Cleanup of architecture doc.
 2014-02-04 14:47:49 +00:00
Dmitriy Zaporozhets 98fe8fb98d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-02-04 16:18:40 +02:00
Dmitriy Zaporozhets 3a1c6cccc5 Merge branch 'bug/500_tag_name' into 'master' 
Fix 500 on tags page

Fix bug when grit parse tags wrong and raise exception on tags page.
Fixes #993
 2014-02-04 14:04:17 +00:00
dosire c296ecfb59 Remove duplication with readme. Remove unneeded spaces. Prevent people writing ~git in the documentation. Descriptive headers. 2014-02-04 14:49:06 +01:00
Dmitriy Zaporozhets 97a4d8aea4 Improve code according to new gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-04 14:46:15 +02:00
Dmitriy Zaporozhets bacfad1c65 Use new gitlab_git revision 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-04 14:45:04 +02:00
Dmitriy Zaporozhets 07157799c4 Merge branch '500-message' into 'master' 
500 Message
 2014-02-04 10:51:38 +00:00
dosire 3a48e1cfd1 Truthful wording. Fixes #934 2014-02-04 11:39:07 +01:00
Dmitriy Zaporozhets 6223a73fc2 Merge pull request #6231 from babatakao/markdown-for-snippets-in-projects 
Enable markdown formatting for snippets in projects.
 2014-02-04 01:29:54 -08:00
Dmitriy Zaporozhets 5d871f1884 Fixed gitlab_git rev 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-03 19:53:54 +02:00
Dmitriy Zaporozhets edc18e777c Merge branch 'bug/filtering' into 'master' 
Bug in issue and merge request filtering

Fixes #1006
 2014-02-03 17:46:34 +00:00
Marin Jankovski 6a87daed76 Filter items by project. 2014-02-03 17:56:31 +01:00
Dmitriy Zaporozhets ca7e4a948b Use new tags/branches from gitlab_git 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-03 18:13:24 +02:00
Dmitriy Zaporozhets 5ec0955919 Use recent gitlab_git lib 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-03 18:12:51 +02:00
Takao BabaandTakao Baba c52bc838cd Enable markdown formatting for snippets in projects. 2014-02-04 01:06:21 +09:00
Marin Jankovski 4b0fb02816 Do not load all projects all the time. 2014-02-03 16:02:44 +01:00
Marin Jankovski 70fb26a6b7 Extract projects and mr into methods in features. 2014-02-03 13:59:20 +01:00
Dmitriy Zaporozhets c573265891 Merge pull request #6227 from jojosch/remove-python-doc 
remove remaining python references
 2014-02-03 03:05:01 -08:00
Johannes Schleifenbaum 7085892e47 remove remaining python references 2014-02-03 11:25:47 +01:00
Dmitriy Zaporozhets 6addb15b15 Bump gitlab_omniauth-ldap gem 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-03 09:45:42 +02:00
Marin Jankovski 75cecf36e0 Scenarios for checking if MR are shown for internal and public projects. 2014-02-02 16:32:12 +01:00
Marin Jankovski d40a7de170 Feature for visit issues page for internal project as auth user. 2014-02-02 00:59:48 +01:00
Marin Jankovski 72d25a26bd Feature visit issues page for public project as auth and non auth user. 2014-02-01 17:47:54 +01:00
Dmitriy Zaporozhets 006df5dfa0 Merge pull request #6218 from brittlewis12/master 
fixed h3, h4 font-sizing for gitlab-flavored markdown (solves issue #6211)
 2014-02-01 05:43:03 -08:00
Dmitriy Zaporozhets 5db3468d7e Merge pull request #5957 from ninech/dont-depend-on-appid-and-appsecret 
refactor omniauth configuration method
 2014-02-01 05:36:25 -08:00
brittlewis12 798360194a changed h3, h4 markdown font sizing to match markdown spec -- h3: 1.5em, h4: 1.2em 2014-01-31 11:46:52 -05:00
Marin Jankovski 468c9ce464 Allow issues to be viewed for authenticated user when project is public or internal. 2014-01-31 17:34:09 +01:00
Dmitriy Zaporozhets 5e004719c4 Merge branch 'bug/broken_mr_select' into 'master' 
Fix broken merge request select

Fixes #991
 2014-01-31 13:41:19 +00:00
Dmitriy Zaporozhets f416b2f5cf Fix bug with merge request branch select 
Merge request target branch select is broken if you submit form and have
some errors on page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-31 13:24:38 +02:00
Dmitriy Zaporozhets 9e181d36ea Dont check for python any more 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-31 13:09:10 +02:00
Dmitriy Zaporozhets d47fb275ce Fix block/remove UI for admin::users#show page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-31 13:04:14 +02:00
Dmitriy Zaporozhets 9939c04e18 Merge branch 'fix/line-numbers' into 'master' 
Fix shifting line numbers.

When there are 1000 lines or more in a file, the link icon causes the numbers to shift down a line when you hover over the line number. This fixes that issue by setting a `nowrap` option for the line number anchor tag.

I also removed the fixed width of 60px for the `line-numbers` div as this causes issues for longer line numbers. I used `visibility: hidden` instead of `display: none` to ensure that the space for the link icon is taken into account. This way auto sizing the div does not cause any problems.

You can see the current behavior by looking at the following:

https://gitlab.com/gitlab-org/gitlab-ce/blob/master/vendor/assets/javascripts/ace-src-noconflict/mode-java.js
 2014-01-31 07:54:50 +00:00
Jason Hollingsworth 25d93987d4 Fix shifting line numbers. 2014-01-30 19:18:59 -06:00
Dmitriy Zaporozhets 74f1da10d1 Use linguist from rubygems 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-30 21:31:10 +02:00
Dmitriy Zaporozhets 3975434802 Merge branch 'remove_pygments' into 'master' 
Remove Pygments.rb
 2014-01-30 19:04:35 +00:00
Dmitriy Zaporozhets c75ab4ec9a Remove python from installation docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-30 19:48:47 +02:00
Dmitriy Zaporozhets d1781d3b11 Get rid of pygments.rb dependency 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-30 19:46:13 +02:00
Dmitriy Zaporozhets 0ee296d1fa Replace pygments with hljs for system hooks help page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-30 18:31:24 +02:00
Dmitriy Zaporozhets 7f03b32049 Merge pull request #6185 from sag47/doc/archy_overview 
An architectural overview of GitLab
 2014-01-30 05:16:43 -08:00
Dmitriy Zaporozhets 705521f3e0 Merge branch 'ui_fixes' into 'master' 
UI Fixes
 2014-01-30 12:53:15 +00:00
Dmitriy Zaporozhets d5e8fcb312 Fix no-highlight code blocks for dark themes 2014-01-30 14:02:57 +02:00
Dmitriy Zaporozhets 57001c2332 Fix protected branches page UI 2014-01-30 13:49:18 +02:00
Dmitriy Zaporozhets ef735e82f3 Remove shade for reopen button 2014-01-30 13:37:06 +02:00
Dmitriy Zaporozhets 30aae10e05 Use 100% width for note edit form 2014-01-30 13:33:29 +02:00
Dmitriy Zaporozhets 89ab7e79ad Highlight code search results 2014-01-30 13:31:56 +02:00
Dmitriy Zaporozhets 3fafac3efa Remove unnecessary text shadow 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-30 13:20:35 +02:00
Dmitriy Zaporozhets b466217965 Fix note form width 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-30 10:57:52 +02:00
Dmitriy Zaporozhets 364bd38d05 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-01-30 10:56:09 +02:00
Dmitriy Zaporozhets 197a704fc4 Merge branch 'nicer_502' into 'master' 
Nicer 502
 2014-01-30 08:12:22 +00:00
Jacob Vosmaer 4fdafcaf8a Merge pull request #5842 from vikraman/patch-1 
Add comment about tls for ldap method
 2014-01-29 10:24:59 -08:00