home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 01:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Hannes Rosenögger 33fea08944 Add placeholders to hipchat service 2015-01-17 18:06:43 +01:00
Ivan Zotov 727363163e Optimize images 24.5% with ImageOptim. 2015-01-17 19:10:28 +03:00
Hannes Rosenögger b0ec61500e Fixes the sort dropdown goind outside of the screen 
see gitlab-org/gitlab-ce#986
 2015-01-17 16:39:29 +01:00
Timo Lilja 09152bad0c Fix "500: Encoding error" on blame view 
This change forces encoding of source line data into UTF-8 and thus
fixes the encoding error at least partially. The issue is described in
https://gitlab.com/gitlab-org/gitlab-ce/issues/894
 2015-01-17 16:15:20 +02:00
Job van der Voort e6ca3a5857 Merge branch 'update_import_doc' into 'master' 
Update import doc

Documentation update for #1900

See merge request !1405
 2015-01-17 07:01:53 +00:00
Marin Jankovski 99647a1b70 Update import.md documentation to specify correct directory ownership and permissions. 2015-01-16 19:36:44 -08:00
Dmitriy Zaporozhets acc3366827 Merge branch 'configure-home-page' into 'master' 
Allow to specify home page for non logged-in users

See merge request !1404
 2015-01-17 03:34:40 +00:00
Dmitriy Zaporozhets f2eb234c06 Fix passign args to original authenticate_user! 2015-01-16 18:12:15 -08:00
Dmitriy Zaporozhets 38600e328b Validate application settings only if column exists 2015-01-16 17:22:17 -08:00
Dmitriy Zaporozhets e7f772550c Add tests to home page url redirect 2015-01-16 16:09:20 -08:00
Dmitriy Zaporozhets 41d7be3ce1 Allow to specify home page for non logged-in users 2015-01-16 16:01:15 -08:00
Daniel Serodio bb80bf3612 Update changelog 2015-01-16 16:55:35 -02:00
Daniel Serodio ad18fcd0e6 Document the description attribute of groups API 2015-01-16 16:52:48 -02:00
Daniel Serodio 6ac8bb0f7c Add description attribute to group API (GET and POST) 2015-01-16 16:52:48 -02:00
Dmitriy Zaporozhets ada6c6080b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-01-16 08:49:18 -08:00
Dmitriy Zaporozhets 5e04977582 Fix signup settings 2015-01-16 08:49:07 -08:00
Dmitriy Zaporozhets 9c0d241e27 Fix tests 2015-01-16 08:47:58 -08:00
Dmitriy Zaporozhets a98727990f Merge branch 'mobile-fixes' into 'master' 
Mobile fixes

See merge request !1403
 2015-01-16 10:12:22 +00:00
Dmitriy Zaporozhets 03a669d81d Fix broadcast message overflow 2015-01-16 00:09:25 -08:00
Dmitriy Zaporozhets 33f27fcb6a Remvoe unnecessary expand buttons 2015-01-15 23:34:30 -08:00
Dmitriy Zaporozhets 4dfa1ed269 Add some mobile fixes to UI 2015-01-15 23:24:30 -08:00
Dmitriy Zaporozhets 67b42e26cf Fix shell version in manual installation doc 2015-01-15 17:23:22 -08:00
Carlos Ribeiro 714ef62264 Fix the email variable substituation in ssh help page 2015-01-15 23:06:32 -02:00
Dmitriy Zaporozhets eb84ee7a20 Better label for diffs 2015-01-15 15:19:58 -08:00
Dmitriy Zaporozhets 41f09bed82 Re-order admin dashboard 2015-01-15 15:19:04 -08:00
Dmitriy Zaporozhets e683d05453 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-15 14:57:55 -08:00
Dmitriy Zaporozhets 3d3c7efa3e Increase font size for lists 2015-01-15 14:55:45 -08:00
Dmitriy Zaporozhets 500dab098b Merge pull request #8568 from Sheigutn/master 
Add support for colored header on Android Lollipop with Chrome
 2015-01-15 14:42:58 -08:00
Dmitriy Zaporozhets d4a8471fe9 Merge pull request #7987 from cirosantilli/get-instead-match 
Replace match via get with get on routes
 2015-01-15 14:42:24 -08:00
Dmitriy Zaporozhets 11591573e1 Merge pull request #7925 from cirosantilli/unused-arguments 
Remove or prepend underscore _ to unused method arguments
 2015-01-15 14:42:03 -08:00
Dmitriy Zaporozhets dbd54fad51 Merge pull request #7905 from cirosantilli/visible-false 
Change always passing visible false tests.
 2015-01-15 14:41:41 -08:00
Dmitriy Zaporozhets 6f78be4d62 Merge pull request #7951 from cirosantilli/uniform-blob-edit 
Make blob new and edit file editors more uniform
 2015-01-15 14:38:07 -08:00
Dmitriy Zaporozhets c5ba87a2fb Merge pull request #8096 from cirosantilli/regex-to-string 
Replace regex methods by string ones since faster and more readable
 2015-01-15 14:37:11 -08:00
Dmitriy Zaporozhets 9c4015f3e8 Merge pull request #8430 from cirosantilli/simplify-ssh-fingerprint-regex 
Simplify SSH fingerprint regexp extraction
 2015-01-15 14:33:24 -08:00
Dmitriy Zaporozhets 84e6fe361d Welcome to 7.8 :) 2015-01-15 14:31:40 -08:00
Dmitriy Zaporozhets 892be53fa3 Merge pull request #8425 from rumpelsepp/rouge 
Replace highlight.js with rouge-fork rugments
 2015-01-15 14:28:24 -08:00
Dmitriy Zaporozhets 23255bff99 Merge branch 'send_checkout_sha_to_services' into 'master' 
Send checkout sha to services

In case of tags it may be useful to have sha of commit this tag points to.
So now web hooks and services get additional parameter `checkout_sha`

See merge request !1400
 2015-01-15 20:01:31 +00:00
Dmitriy Zaporozhets 089df35f02 Merge branch 'remove-password-strength-indicator' into 'master' 
Remove password strength indicator

We were having the following issues:
- the indicator would sometimes stay red even if the password that was
  entered was long enough;
- the indicator had a middle yellow signal: what does that mean?
- the red/green backgrounds were not color-blind-friendly.

See merge request !1399
 2015-01-15 19:20:43 +00:00
Dmitriy Zaporozhets 5254de907d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-15 11:18:26 -08:00
Dmitriy Zaporozhets 4cd1b6d98e Merge branch 'fix-tab-index' into 'master' 
Fix tab index

Fixes #1892

See merge request !1401
 2015-01-15 19:18:04 +00:00
Dmitriy Zaporozhets de27375d6c Test git builder over annotated tag 2015-01-15 11:17:47 -08:00
Dmitriy Zaporozhets c6ab8d04e8 Fix tabindex for comment form 2015-01-15 10:34:40 -08:00
Sytse Sijbrandij e310199a53 Merge pull request #8576 from kfei/docker/update-omnibus-package 
Update the Omnibus package in Dockerfile
 2015-01-15 10:26:41 -08:00
Dmitriy Zaporozhets a0d4235c04 Send checkout sha for web hooks and services 2015-01-15 10:26:33 -08:00
Jacob Vosmaer b79ada97bb Remove password strength indicator 
We were having the following issues:
- the indicator would sometimes stay red even if the password that was
  entered was long enough;
- the indicator had a middle yellow signal: what does that mean?
- the red/green backgrounds were not color-blind-friendly.
 2015-01-15 14:10:13 +01:00
Stefan Tatschner 089516209c Fixed tests 2015-01-15 14:01:12 +01:00
Stefan Tatschner bf079c24af Replace highlight.js with rouge-fork rugments 
I decided to create a fork of rouge as rouge lacks a HTML formatter with
the required options such as wrapping a line with <span> tags.
Furthermore I was not really convinced about the clarity of rouge's
source code.

Rugments 1.0.0beta3 for now only includes some basic linting and a new
HTML formatter. Everything else should behave the same.
 2015-01-15 13:41:11 +01:00
Stefan Tatschner 377ae46005 Updated gollum-libs 
I did this commit in an earlier revision of my pull request. As
reverting this commit later caused failing tests I decided to
include it again.
 2015-01-15 13:13:54 +01:00
Dmitriy Zaporozhets 1e0f36b42a Merge branch 'fix-comments' into 'master' 
Fix comments

Fixes:

* drag-n-drop works for diff comments
* selecting images works for diff comments
* preview works for edit comments
* drag-n-drop works for edit comments
* selecting images works for edit comments
* if comment presented on 'Discussion' and 'Changes' tabs - after edit it updates on both tabs.
* Correctly hide form when edit comment on diff
* fix full-screen for diff comments

See merge request !1398
 2015-01-15 09:18:10 +00:00
Dmitriy Zaporozhets b124d9e0bb Comment broken test because I dont have time to improve it 2015-01-15 01:17:07 -08:00