Commit Graph
14039 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 18529269c6 truncate long branch names on MR index
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-07 14:43:07 +03:00
Dmitriy Zaporozhets c9104fa6e4 Fix search dropdown css. Improve jquery styles
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-07 14:26:49 +03:00
Marin Jankovski 99e0d0dd6f Unstub after the test is done. 2014-05-07 11:52:07 +02:00
Dmitriy Zaporozhets fa7d0e3ae0 Fix MR widget UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-07 12:21:02 +03:00
Ahmed Shafeeq 14102fd211 Remove extra "Compile assets" section 2014-05-07 01:14:00 +08:00
Dmitriy Zaporozhets a94b06e7b5 Merge branch 'postgres_fix' into 'master'
Postgres fix. Closes #175
2014-05-06 15:20:26 +00:00
Dmitriy Zaporozhets 118d06a3e2 Merge branch 'mobile_menu_help' into 'master'
Fix mobile menu after adding help link

After https://github.com/gitlabhq/gitlabhq/pull/6897 the mobile menu ran off the left side of the screen. I don't see much we can do to squeeze all the items into mobile's width. I think hiding one of the items is acceptable and which is a matter of opinion.  I suggest hiding the user's avatar on mobile but the search icon or help icon would both be options as well. Let me know if you want a different icon hidden on mobile.

[Before Screenshot](https://www.dropbox.com/s/hnfmaln3ilcy0p7/Screen%20Shot%202014-05-02%20at%205.17.28%20PM.png)
[After Screenshot](https://www.dropbox.com/s/3ifxa8gfa12h37h/Screen%20Shot%202014-05-05%20at%204.52.25%20AM.png)
2014-05-06 15:19:53 +00:00
Dmitriy Zaporozhets e026491d53 Merge pull request #6927 from ahmedshafeeq/patch-1
Use production for Gitlab shell installation
2014-05-06 18:07:25 +03:00
Ahmed Shafeeq 536b2f2f75 Use production for Gitlab shell installation 2014-05-06 22:02:21 +08:00
Dmitriy Zaporozhets 5ce1418406 Merge pull request #6799 from Datacom/bug/parallel_diff_missing_lines_pr
Fix missing lines in Parallel Diff
2014-05-06 15:34:33 +03:00
Sytse Sijbrandij aefdac00a2 Merge pull request #6716 from pkgr/pkgr
Automatically generate debian package with pkgr.io
2014-05-06 14:32:10 +02:00
Cyril Rohr 402361afff Setup default gitlab.yml with possibility to override default url via environment variable.
This only applies to packaging with https://pkgr.io.
2014-05-06 11:34:17 +01:00
Cyril Rohr b1d68b6e9b Add .pkgr.yml file for automated packaging on https://pkgr.io 2014-05-06 11:34:17 +01:00
Dmitriy Zaporozhets 81ecd1195f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-05-06 13:21:44 +03:00
Dmitriy Zaporozhets e640481625 Merge branch 'files_in_wiki' into 'master'
Add support to show files from wiki repository on wiki pages
2014-05-06 10:21:05 +00:00
Marin Jankovski 00cd3ecc44 Use stub in testing. 2014-05-06 09:57:08 +02:00
Dmitriy ZaporozhetsandMarin Jankovski b96ad52e10 Change gitlab:test task
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-06 08:52:58 +02:00
Dmitriy Zaporozhets 5a00e76fb0 Merge pull request #6925 from maiki/patch-1
Fixed misspelling
2014-05-06 09:45:33 +03:00
Dmitriy Zaporozhets 478d6bd479 Merge branch 'mobile_issues' into 'master'
Improve issue and MR mobile UI

Improve the mobile UI for issues and merge requests. To make use of Bootstrap's column grid this also slightly alters the current desktop UI. Namely, the state box is slightly wider and is a 2-column width rather than being a fixed width. This makes it so we can easily break the row into 2 lines on mobile.

### Current UI
[Mobile Current](https://www.dropbox.com/s/z3wai49rmo1hwoo/Screen%20Shot%202014-05-02%20at%205.32.45%20PM.png)

[Desktop Current](https://www.dropbox.com/s/pwbg9hm3dqft19p/Screen%20Shot%202014-05-02%20at%205.36.10%20PM.png)

### Proposed UI
[Mobile Proposed](https://www.dropbox.com/s/csb4xny28jlll0l/Screen%20Shot%202014-05-02%20at%205.28.35%20PM.png)

[Desktop Proposed](https://www.dropbox.com/s/pb64wzbh75jb9s4/Screen%20Shot%202014-05-02%20at%205.30.23%20PM.png)
2014-05-06 06:27:02 +00:00
Dmitriy Zaporozhets fd7a221cca Change gitlab:test task
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-06 09:07:15 +03:00
maiki de576be52e Fixed misspelling
Change one letter, change the world!
2014-05-05 15:47:56 -07:00
Philip Blatter a7bdf87f43 Added some tests. 2014-05-05 21:50:03 +02:00
Philip Blatter 11bedfe37d Now using correct ids as reference if we are informing about a new note. 2014-05-05 21:48:49 +02:00
Philip Blatter 06bed543e6 Added email threading for update emails on issues and merge requests (if the mail client support the References: mail header) 2014-05-05 21:46:51 +02:00
Job van der Voort 6dc09db53d monthly doc tweet template, small changes 2014-05-05 17:14:58 +02:00
Job van der Voort 23665d2506 add loop to deploy key to multiple projects 2014-05-05 17:04:19 +02:00
Dmitriy Zaporozhets aeb5a01ed1 Merge branch 'improve-dev-seeds' into 'master'
Improve dev seeds
2014-05-05 13:43:52 +00:00
Dmitriy Zaporozhets 2fbb4b0545 Merge branch 'clean-satellite' into 'master'
Clean working directory in satellite
2014-05-05 13:43:12 +00:00
Dmitriy Zaporozhets f5c4bda8fe Improve MR seeds
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-05 15:07:19 +03:00
Marin Jankovski fac225780c A bit clearer naming for gollum_wiki. 2014-05-05 14:01:48 +02:00
Marin Jankovski 5a949e6095 Add tests for wiki files showing. 2014-05-05 13:47:47 +02:00
Job van der Voort dc1eff9b91 remove redundancy, remove really good joke, add step to release 2014-05-05 13:34:43 +02:00
Dmitriy Zaporozhets 4f670fbe9c Create seed projects with different visibility
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-05 14:30:50 +03:00
Dmitriy Zaporozhets cac916d974 Clean working directory in satellite
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-05 14:21:00 +03:00
Drew Blessing ad0f5fdc27 Improve mobile UI for issues and merge requests 2014-05-05 05:03:37 -05:00
Marin Jankovski 4146e885dd Fix styling issues. 2014-05-05 11:55:49 +02:00
Sytse Sijbrandij f09a1ef81d Merge branch 'add_database_req' into 'master'
Add database req

added database requirements in documentation
2014-05-05 08:46:39 +00:00
Marc Radulescu 73801a7463 added database requirements in documentation 2014-05-05 10:04:52 +02:00
Job van der Voort ba37f84067 Merge branch 'master' into monthly-revision
Conflicts:
	doc/release/monthly.md
2014-05-05 08:14:50 +02:00
Job van der Voort db7f07387f add ee, ci and patch release 2014-05-05 08:09:46 +02:00
Dmitriy Zaporozhets 172ad96245 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-05-03 20:50:54 +03:00
Dmitriy Zaporozhets ee62a60f1d Merge branch 'add-cli-to-reame' into 'master'
Add cli to reame
2014-05-03 17:43:19 +00:00
Sytse Sijbrandij d5e49e2592 Merge branch 'fix-typo-help-permissions' into 'master'
Fix documentation typo in permissions help file
2014-05-03 11:59:13 +00:00
dosire cac61501fd Add command line client information and fix link to ee. 2014-05-03 11:03:34 +02:00
Drew Blessing d210484205 Fix mobile menu after adding help link 2014-05-02 17:14:58 -05:00
Dmitriy Zaporozhets 993fc84855 Use sign icon style for help link
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-02 22:00:23 +03:00
Dmitriy Zaporozhets c5ef0c60bf Merge branch 'improve-admin-projects-page' into 'master'
Improve admin projects page

Add dropdown for project sorting
2014-05-02 15:07:54 +00:00
Dmitriy Zaporozhets c608a5dcea Add sort dropdown for admin projects page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-02 17:02:57 +03:00
Dmitriy Zaporozhets 9dfc4fe6ac Merge branch 'repo-size-in-db' into 'master'
Save repository size to projects table

This will allow us to get largest repos by simple sql query.

Also it increase loading of `admin/projects` page a lot because right now it calculate 20x project sizes per page
2014-05-02 13:48:26 +00:00
Dmitriy Zaporozhets 3bec6e8940 Merge branch 'fix-404-jquery-ui' into 'master'
Fix 404 jquery ui

Fixes #1211
2014-05-02 13:07:12 +00:00