Permalink
Browse files

Merge remote-tracking branch 'gitlabhq/master' into git_commit_fix

Conflicts:
	doc/install/installation.md
  • Loading branch information...
2 parents 944d382 + 3c7806c commit 93f0a8c9b3ca2aa4fdaccbea1547af3b0038a7dd @japgolly japgolly committed Nov 11, 2012
Showing 369 changed files with 102,659 additions and 1,361 deletions.
View
@@ -4,7 +4,7 @@ env:
before_install:
- sudo apt-get install libicu-dev -y
- sudo apt-get install libqt4-dev libqtwebkit-dev -y
- - gem install charlock_holmes -v="0.6.8"
+ - gem install charlock_holmes -v="0.6.9"
branches:
only:
- 'master'
View
@@ -28,7 +28,7 @@ v 3.0.0
- Reject ssh keys that break gitolite
- [API] list one project hook
- [API] edit project hook
- - [API] add project snippets list
+ - [API] list project snippets
- [API] allow to authorize using private token in HTTP header
- [API] add user creation
View
@@ -1,4 +1,4 @@
-## Contribute to GitLab
+## Contribute to GitLab
If you want to contribute to GitLab, follow this process:
@@ -7,24 +7,20 @@ If you want to contribute to GitLab, follow this process:
3. Code
4. Create a pull request
-We will only accept pull requests if:
+We will only accept pull requests if:
* Your code has proper tests and all tests pass
-* Your code can be merged w/o problems
+* Your code can be merged w/o problems
* It won't break existing functionality
* It's quality code
* We like it :)
-## [You may need a developer VM](https://github.com/gitlabhq/developer-vm)
+For examples of feedback on pull requests please look at the [closed pull requests](https://github.com/gitlabhq/gitlabhq/pulls?direction=desc&page=1&sort=created&state=closed).
-## Running tests
-
-To run the specs for GitLab, you need to run seeds for test db.
+## Installation
- cd gitlabhq
- rake db:seed_fu RAILS_ENV=test
+Install the Gitlab development in a virtual machine with the [Gitlab Vagrant virtual machine](https://github.com/gitlabhq/gitlab-vagrant-vm). Installing it in a virtual machine makes it much easier to set up all the dependencies for integration testing.
-Then you can run the test suite with rake:
-
- rake gitlab:test
+## Running tests
+For more information on running the tests please read the [development tips](https://github.com/gitlabhq/gitlabhq/blob/master/doc/development.md)
View
31 Gemfile
@@ -11,9 +11,9 @@ end
gem "rails", "3.2.8"
# Supported DBs
-gem "sqlite3", :group => :sqlite
-gem "mysql2", :group => :mysql
-gem "pg", :group => :postgres
+gem "sqlite3", group: :sqlite
+gem "mysql2", group: :mysql
+gem "pg", group: :postgres
# Auth
gem "devise", "~> 2.1.0"
@@ -23,10 +23,11 @@ gem 'omniauth-twitter'
gem 'omniauth-github'
# GITLAB patched libs
-gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
-gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git", :ref => "f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e"
-gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
-gem 'grack', :git => "https://github.com/gitlabhq/grack.git"
+gem "grit", git: "https://github.com/gitlabhq/grit.git", ref: '7f35cb98ff17d534a07e3ce6ec3d580f67402837'
+gem "omniauth-ldap", git: "https://github.com/gitlabhq/omniauth-ldap.git", ref: 'f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e'
+gem 'yaml_db', git: "https://github.com/gitlabhq/yaml_db.git", ref: '98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd'
+gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8'
+gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '212fd40bea61f3c6a167223768e7295dc32bbc10'
# Gitolite client (for work with gitolite-admin repo)
gem "gitolite", '1.1.0'
@@ -35,7 +36,7 @@ gem "gitolite", '1.1.0'
gem "pygments.rb", "0.3.1"
# Language detection
-gem "github-linguist", "~> 2.3.4" , :require => "linguist"
+gem "github-linguist", "~> 2.3.4" , require: "linguist"
# API
gem "grape", "~> 0.2.1"
@@ -83,9 +84,6 @@ gem 'resque_mailer'
# HTTP requests
gem "httparty"
-# Handle encodings
-gem "charlock_holmes"
-
# Colored output to console
gem "colored"
@@ -114,8 +112,9 @@ group :assets do
end
group :development do
+ gem "annotate", git: "https://github.com/ctran/annotate_models.git"
gem "letter_opener"
- gem "annotate", :git => "https://github.com/ctran/annotate_models.git"
+ gem 'quiet_assets', '1.0.1'
gem 'rack-mini-profiler'
end
@@ -137,13 +136,13 @@ group :development, :test do
gem 'guard-spinach'
# Notification
- gem 'rb-fsevent', :require => darwin_only('rb-fsevent')
- gem 'growl', :require => darwin_only('growl')
- gem 'rb-inotify', :require => linux_only('rb-inotify')
+ gem 'rb-fsevent', require: darwin_only('rb-fsevent')
+ gem 'growl', require: darwin_only('growl')
+ gem 'rb-inotify', require: linux_only('rb-inotify')
end
group :test do
- gem "simplecov", :require => false
+ gem "simplecov", require: false
gem "shoulda-matchers"
gem 'email_spec'
gem 'resque_spec'
View
@@ -7,6 +7,7 @@ GIT
GIT
remote: https://github.com/gitlabhq/grack.git
revision: ba46f3b0845c6a09d488ae6abdce6ede37e227e8
+ ref: ba46f3b0845c6a09d488ae6abdce6ede37e227e8
specs:
grack (1.0.0)
rack (~> 1.4.1)
@@ -22,6 +23,14 @@ GIT
posix-spawn (~> 0.3.6)
GIT
+ remote: https://github.com/gitlabhq/grit_ext.git
+ revision: 212fd40bea61f3c6a167223768e7295dc32bbc10
+ ref: 212fd40bea61f3c6a167223768e7295dc32bbc10
+ specs:
+ grit_ext (0.6.0)
+ charlock_holmes (~> 0.6.9)
+
+GIT
remote: https://github.com/gitlabhq/omniauth-ldap.git
revision: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e
ref: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e
@@ -35,6 +44,7 @@ GIT
GIT
remote: https://github.com/gitlabhq/yaml_db.git
revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
+ ref: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
specs:
yaml_db (0.2.2)
@@ -90,7 +100,7 @@ GEM
carrierwave (0.6.2)
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
- charlock_holmes (0.6.8)
+ charlock_holmes (0.6.9)
childprocess (0.3.2)
ffi (~> 1.0.6)
chosen-rails (0.9.8.3)
@@ -260,6 +270,8 @@ GEM
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
pyu-ruby-sasl (0.0.3.3)
+ quiet_assets (1.0.1)
+ railties (~> 3.1)
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
@@ -411,7 +423,6 @@ DEPENDENCIES
capybara
capybara-webkit
carrierwave
- charlock_holmes
chosen-rails
coffee-rails (= 3.2.2)
colored
@@ -432,6 +443,7 @@ DEPENDENCIES
grack!
grape (~> 0.2.1)
grit!
+ grit_ext!
growl
guard-rspec
guard-spinach
@@ -454,6 +466,7 @@ DEPENDENCIES
pg
pry
pygments.rb (= 0.3.1)
+ quiet_assets (= 1.0.1)
rack-mini-profiler
rails (= 3.2.8)
rails-dev-tweaks
View
@@ -1,2 +0,0 @@
-web: bundle exec rails s -p $PORT -e production
-worker: bundle exec rake environment resque:work RAILS_ENV=production QUEUE=*
View
@@ -0,0 +1,19 @@
+## GitLab Roadmap
+
+### Common
+
+* Help page for service tasks like repos import, backup etc
+* Hide last push widget after following link
+* Add comment events
+* Dashboard/Project activity events filter
+
+### Issues
+
+* labels autocomplete via jquery autocomplete
+* Import/Export issues
+* Form: Assign to me link right to the selectbox
+
+### Merge Request
+
+* CI build status
+* Save code fragments with MR comments
View
@@ -1 +1 @@
-3.0.3
+3.1.0pre
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -17,6 +17,8 @@
//= require modernizr
//= require chosen-jquery
//= require raphael
+//= require g.raphael-min
+//= require g.bar-min
//= require branch-graph
//= require ace-src-noconflict/ace
//= require_tree .
@@ -1,57 +1,47 @@
+# Creates the variables for setting up GFM auto-completion
-###
- Creates the variables for setting up GFM auto-completion
-###
# Emoji
-window.autocompleteEmojiData = [];
-window.autocompleteEmojiTemplate = "<li data-value='${insert}'>${name} <img alt='${name}' height='20' src='${image}' width='20' /></li>";
+data = []
+template = "<li data-value='${insert}'>${name} <img alt='${name}' height='20' src='${image}' width='20' /></li>"
+window.autocompleteEmoji = {data, template}
# Team Members
-window.autocompleteMembersUrl = "";
-window.autocompleteMembersParams =
- private_token: ""
- page: 1
-window.autocompleteMembersData = [];
+url = '';
+params = {private_token: '', page: 1}
+window.autocompleteMembers = {data, url, params}
+# Add GFM auto-completion to all input fields, that accept GFM input.
+window.setupGfmAutoComplete = ->
+ $input = $('.js-gfm-input')
+ # Emoji
+ $input.atWho ':',
+ data: autocompleteEmoji.data,
+ tpl: autocompleteEmoji.template
-###
- Add GFM auto-completion to all input fields, that accept GFM input.
-###
-window.setupGfmAutoComplete = ->
- ###
- Emoji
- ###
- $('.gfm-input').atWho ':',
- data: autocompleteEmojiData,
- tpl: autocompleteEmojiTemplate
-
- ###
- Team Members
- ###
- $('.gfm-input').atWho '@', (query, callback) ->
+ # Team Members
+ $input.atWho '@', (query, callback) ->
(getMoreMembers = ->
- $.getJSON(autocompleteMembersUrl, autocompleteMembersParams)
- .success (members) ->
- # pick the data we need
- newMembersData = $.map members, (m) -> m.name
-
- # add the new page of data to the rest
- $.merge autocompleteMembersData, newMembersData
-
- # show the pop-up with a copy of the current data
- callback autocompleteMembersData[..]
-
- # are we past the last page?
- if newMembersData.length == 0
- # set static data and stop callbacks
- $('.gfm-input').atWho '@',
- data: autocompleteMembersData
- callback: null
- else
- # get next page
- getMoreMembers()
+ $.getJSON(autocompleteMembers.url, autocompleteMembers.params).success (members) ->
+ # pick the data we need
+ newMembersData = $.map members, (m) -> m.name
+
+ # add the new page of data to the rest
+ $.merge autocompleteMembers.data, newMembersData
+
+ # show the pop-up with a copy of the current data
+ callback autocompleteMembers.data[..]
+
+ # are we past the last page?
+ if newMembersData.length is 0
+ # set static data and stop callbacks
+ $input.atWho '@',
+ data: autocompleteMembers.data
+ callback: null
+ else
+ # get next page
+ getMoreMembers()
# so the next request gets the next page
- autocompleteMembersParams.page += 1;
- ).call();
+ autocompleteMembers.params.page += 1
+ ).call()
@@ -1,10 +0,0 @@
-initGraphNav = ->
- $('.graph svg').css 'position', 'relative'
-
- $('body').bind 'keyup', (e) ->
- if e.keyCode is 37 # left
- $('.graph svg').animate left: '+=400'
- else if e.keyCode is 39 # right
- $('.graph svg').animate left: '-=400'
-
-window.initGraphNav = initGraphNav
@@ -1,6 +1,5 @@
-function switchToNewIssue(form){
+function switchToNewIssue(){
$(".issues_content").hide("fade", { direction: "left" }, 150, function(){
- $(".issues_content").after(form);
$('select#issue_assignee_id').chosen();
$('select#issue_milestone_id').chosen();
$("#new_issue_dialog").show("fade", { direction: "right" }, 150);
@@ -10,9 +9,8 @@ function switchToNewIssue(form){
});
}
-function switchToEditIssue(form){
+function switchToEditIssue(){
$(".issues_content").hide("fade", { direction: "left" }, 150, function(){
- $(".issues_content").after(form);
$('select#issue_assignee_id').chosen();
$('select#issue_milestone_id').chosen();
$("#edit_issue_dialog").show("fade", { direction: "right" }, 150);
@@ -33,8 +31,8 @@ function switchFromEditIssue(){
function backToIssues(){
$("#edit_issue_dialog, #new_issue_dialog").hide("fade", { direction: "right" }, 150, function(){
$(".issues_content").show("fade", { direction: "left" }, 150, function() {
- $("#edit_issue_dialog").remove();
- $("#new_issue_dialog").remove();
+ $("#edit_issue_dialog").html("");
+ $("#new_issue_dialog").html("");
$('.add_new').show();
});
});
@@ -1,5 +0,0 @@
-Loader =
- html: (width) ->
- $('<img>').attr src: '/assets/ajax-loader.gif', width: width
-
-window.Loader = Loader
Oops, something went wrong.

0 comments on commit 93f0a8c

Please sign in to comment.