Commit Graph
13452 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 4e7df0037a Fix ci data in hook when create git tag via UI 2015-01-12 00:05:04 -08:00
Dmitriy Zaporozhets 3197044512 Refactor push data builder. Moved it to separate class
Also execute GitLab CI on creating tag via UI
2015-01-11 23:51:31 -08:00
Dmitriy Zaporozhets 31bcd04711 Merge branch 'gitlab-ci-on-tag' into 'master'
When push tag - trigger GitLab CI

See merge request !1383
2015-01-11 17:08:49 +00:00
Dmitriy Zaporozhets f31a96104f Add flatten-dir branch to seed repo 2015-01-10 22:48:16 -08:00
Dmitriy Zaporozhets 2543af84f0 Execute GitLab CI on tag push 2015-01-10 22:18:14 -08:00
Dmitriy Zaporozhets f891ababeb Fix randomly failing test 2015-01-10 21:42:16 -08:00
Dmitriy Zaporozhets 78bf00c788 Merge branch 'fix-git-blame' into 'master'
Fix File blame not respecting branch selection

See merge request !1382
2015-01-11 05:17:09 +00:00
Dmitriy Zaporozhets 4666515538 Merge branch 'flatten-dirs' into 'master'
Flatten the directory hierarchy while there is only one directory descendant

In some languages, especially java, the directory structure reflects the package structure.This means that using the file tree browser to reach the directories that matter you have to click a lot of directories containing only another subdirectory.

This merge request tries to enhance this by showing and providing the link to the first directory that doesn't contain only one directory.

See also [this feature request](http://feedback.gitlab.com/forums/176466-general/suggestions/6236769-jump-forward-to-the-first-folder-that-has-more-tha)

This is very similar to what [GitHub does](https://github.com/blog/1877-folder-jumping), but I don't think graying out the empty directories is really necessary.

Screenshots: [Before](https://gitlab.com/uploads/marmis85/gitlab-ce/b683a0000f/before.png) - [After](https://gitlab.com/uploads/marmis85/gitlab-ce/a23725a1c1/after.png)

I'm actually very new at ruby, rails, haml, and almost everything involved in Gitlab's development...
From what I could understand, when we render each directory item in the list we only have the data structure representing the item but not his descendants.
To iterate through the hierarchy I call Gitlab::Git:Tree.where() but I'm not sure if this is the most efficient way.

I also considered making every directory a clickable link, but I tried that and in the end it wasn't very useful and reduced the click target for the most useful directory.

See merge request !275
2015-01-11 04:42:28 +00:00
marmis85 02adb9ccd6 point to a specific branch in the test repo to avoid conflicts 2015-01-11 05:07:34 +01:00
Valery Sizov ee28ee5f13 rspec fix 2015-01-10 20:04:06 -08:00
Dmitriy Zaporozhets 49eacb84e9 Update CHANGELOG 2015-01-10 19:52:27 -08:00
Dmitriy Zaporozhets 13b86fcb02 Fix git blame on file not respecting branch selection 2015-01-10 19:50:35 -08:00
Dmitriy Zaporozhets e9bf4e411f Merge branch 'release-doc' into 'master'
Release doc

See merge request !1381
2015-01-11 03:33:57 +00:00
Sytse Sijbrandij 37163d7c75 Small spelling improvements. 2015-01-10 19:28:50 -08:00
Dmitriy Zaporozhets 9698f07763 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-01-10 19:26:17 -08:00
Dmitriy Zaporozhets b758b4c80b If noteable is nil - make discussion outdated 2015-01-10 19:26:00 -08:00
Sytse Sijbrandij a28cad0cf3 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into prose-requirement 2015-01-10 19:19:44 -08:00
Sytse Sijbrandij 679b450c49 Merge branch 'refactor-release-doc' into 'master'
Refactor release doc

* Follow issue as todo list instead of document
* move huge rc1 block to separate file
* cleanup and fix order of some actions

See merge request !1379
2015-01-11 03:18:59 +00:00
Dmitriy Zaporozhets fe0174799d Merge branch 'easy-dev-install' into 'master'
Easy dev install

@jeroenvanbaarsen  just tried the following:

1. Removing therubyracer from gemfile
2. Install node (brew install node or sudo apt-get install nodejs)
3. Run $ spinach features/

All worked as before, so this would mean people have to install the node dependency on their local machine, but in my experience this is much easier than installing libv8, especially for non ruby-devs. /cc @jacobvosmaer

See merge request !262
2015-01-11 01:39:43 +00:00
Dmitriy Zaporozhets 1c3c8a9c55 Make ordered lists for release doc 2015-01-11 01:34:35 +00:00
Dmitriy Zaporozhets 2e3749cdcc Replace befor with before 2015-01-11 01:32:42 +00:00
marmis85 32233d522f updated master to latests sha 2015-01-11 00:15:56 +01:00
marmis85 3efb06a22b Add test spec for TreeHelper module 2015-01-10 21:37:48 +01:00
Valery SizovandValery Sizov a9f7fd2c1a Github Importer 2015-01-10 09:51:43 -08:00
Dmitriy Zaporozhets f65bed6ddf Merge branch 'async-satellites' into 'master'
Async satellites

Do merge request automerge via satellite.

See merge request !1380
2015-01-10 04:27:25 +00:00
Dmitriy Zaporozhets 9c03c1c545 Make automerge via satellite 2015-01-09 19:10:01 -08:00
Dmitriy Zaporozhets c736968695 Improve monthly.md with fixes proposed from Sytse 2015-01-10 02:14:45 +00:00
Dmitriy Zaporozhets b9dd52dd14 Improve monthly.md with fixes proposed from Sytse 2015-01-10 02:13:09 +00:00
Dmitriy Zaporozhets 606c701bd0 Improve monthly.md with fixes proposed from @sytse 2015-01-10 02:12:00 +00:00
Dmitriy Zaporozhets 3c19929c75 Cleanup and refactor release doc. Follow issue as a todo list 2015-01-09 12:29:48 -08:00
Jacob Vosmaer bc95576e2c Rescue missing database errors
While loading the Rails app we cannot assume that the gitlabhq_xxx
database exists already. If we do, `rake gitlab:setup` breaks!

This is a quick hack to make sure that fresh development setups of
GitLab (from master) will work again.
2015-01-09 11:26:26 +01:00
Dmitriy Zaporozhets d531de0bc9 Merge branch 'popen_close_stdin'
Conflicts:
	CHANGELOG
2015-01-08 15:54:34 -08:00
Dmitriy Zaporozhets ff39821935 Update CHANGELOG 2015-01-08 15:43:34 -08:00
Dmitriy Zaporozhets 9e222d6d0e Merge branch 'app-settings' into 'master'
Dynamic application settings in database

See merge request !1378
2015-01-08 23:10:10 +00:00
Dmitriy Zaporozhets 08c9cb4cab Finally fix stuff related to dynamic config 2015-01-08 14:26:43 -08:00
Dmitriy Zaporozhets 939c046a98 Fix feature and tests 2015-01-08 13:21:00 -08:00
Dmitriy Zaporozhets d0a50985ec Create ApplicationSettings if does not exist in runtime 2015-01-08 11:26:16 -08:00
Dmitriy Zaporozhets 8133e44998 Hack for migrating to new settings 2015-01-08 10:30:35 -08:00
Dmitriy Zaporozhets 57a65ede77 Improve application settings and write tests 2015-01-08 09:53:35 -08:00
Jacob Vosmaer dec168932e Merge remote-tracking branch 'dev_gitlab_org/master' into git-http-blacklist
Conflicts:
	CHANGELOG
2015-01-08 10:57:08 +01:00
Dmitriy Zaporozhets 8589b4e137 Init ApplicationSettings resource with defaults from config file 2015-01-08 00:22:50 -08:00
Dmitriy Zaporozhets d02a22ba21 Redesign signin/singup pages 2015-01-07 17:07:36 -08:00
Sytse Sijbrandij 703087b8bf User interface text guideline added. 2015-01-07 14:59:22 -08:00
Dmitriy Zaporozhets 757df0142f GitLab does not work well with Ruby 2.2 yet 2015-01-07 10:58:17 -08:00
Dmitriy Zaporozhets 21ae36c6b5 Merge branch 'update_api_messages' into 'master'
Update api messages

See merge request !1364
2015-01-07 15:53:17 +00:00
Marin Jankovski 1fbeaa0684 Merge branch 'master' into update_api_messages
Conflicts:
	CHANGELOG
2015-01-07 12:30:08 +01:00
Marin Jankovski fd100e381a Add returned API messages updates to changelog. 2015-01-07 11:39:43 +01:00
Marin Jankovski 8dd672776e Fix failing tests due to updates on the return messages. 2015-01-07 11:39:20 +01:00
Marin Jankovski cd0aed3d54 Add a message when unable to save an object through api. 2015-01-07 10:46:00 +01:00
Dmitriy Zaporozhets de6256ee67 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-06 21:50:00 -08:00