Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'feature/project-export' into 'master' | Douwe Maan | 2016-06-17 | 1 | -1/+1 |
|\ | |||||
| * | fixed merge conflicts on UI branch | James Lopez | 2016-06-16 | 1 | -2/+4 |
| |\ | |||||
| * \ | Merge branches 'feature/project-export-ui-experimental' and 'feature/project-... | James Lopez | 2016-06-13 | 1 | -21/+31 |
| |\ \ | |||||
| * \ \ | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-05-09 | 1 | -2/+3 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-05-03 | 1 | -4/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into... | James Lopez | 2016-04-25 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * | | | | | | gitlab import UI - icon, file selector, etc... Also updated font-awesome and ... | James Lopez | 2016-04-22 | 1 | -1/+1 |
* | | | | | | | Use gitlab-git 10.2.0bump-gitlab-git-10.2.0 | Stan Hu | 2016-06-16 | 1 | -1/+1 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge branch 'network-assets' into 'master' | Jacob Schatz | 2016-06-15 | 1 | -1/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Replace raphael-rails with raphael.js so it can be split from the rest of the... | Connor Shea | 2016-06-10 | 1 | -1/+0 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge remote-tracking branch 'origin/master' into artifacts-expire-date | Kamil Trzcinski | 2016-06-14 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update brakeman from 3.2.1 to 3.3.2 | Connor Shea | 2016-06-12 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Allow to expire build artifacts | Kamil Trzcinski | 2016-06-13 | 1 | -0/+3 |
|/ / / / / | |||||
* | | | | | Merge branch 'support-fog-azure' into 'master' | Rémy Coutable | 2016-06-08 | 1 | -0/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Add Azure to supported backup list (left out accidentally) | Stan Hu | 2016-06-07 | 1 | -0/+1 |
* | | | | | | Bump recaptcha gem to 3.0.0 to remove deprecated stoken support | Stan Hu | 2016-06-07 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Load knapsack in Rakefile only when is bundledload-knapsack-if-defined | Kamil Trzcinski | 2016-06-07 | 1 | -1/+1 |
* | | | | | Merge remote-tracking branch 'origin/master' into knapsack | Kamil Trzcinski | 2016-06-07 | 1 | -3/+6 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'license-finder-gem' into 'master' | Rémy Coutable | 2016-06-07 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Add License Finder gem. | Connor Shea | 2016-06-06 | 1 | -0/+2 |
| * | | | | | | Bump rouge to 1.11.0 | Stan Hu | 2016-06-06 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | | | | | Update the `browser` gem. | Timothy Andrew | 2016-06-06 | 1 | -1/+1 |
| * | | | | | Add a `U2fRegistrations` table/model. | Timothy Andrew | 2016-06-06 | 1 | -0/+1 |
| * | | | | | Replace colorize gem with rainbow. | Connor Shea | 2016-06-03 | 1 | -1/+1 |
* | | | | | | Use knapsack 1.11.0 | Kamil Trzcinski | 2016-06-03 | 1 | -1/+1 |
* | | | | | | Use own version of knapsack which supports spinach tests | Kamil Trzcinski | 2016-06-03 | 1 | -1/+1 |
* | | | | | | Try to use knapsack | Kamil Trzcinski | 2016-06-03 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge branch 'reduce-fog-deps' into 'master' | Robert Speicher | 2016-06-02 | 1 | -1/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Reduce number of fog gem dependenciesreduce-fog-deps | Stan Hu | 2016-06-01 | 1 | -1/+7 |
* | | | | | | Merge branch 'upgrade-devise-two-factor' into 'master' | Robert Speicher | 2016-06-02 | 1 | -4/+3 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Upgrade attr_encrypted and encryptor | Connor Shea | 2016-05-30 | 1 | -1/+1 |
| * | | | | | Upgrade devise and devise-two-factor, remove devise-async | Connor Shea | 2016-05-30 | 1 | -3/+2 |
* | | | | | | Upgrade Kaminari from 0.16.3 to 0.17.0. | Connor Shea | 2016-05-31 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge branch 'updated-contrib-calendar' into 'master' | Jacob Schatz | 2016-05-25 | 1 | -3/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Removed cal heatmap from gemfile | Phil Hughes | 2016-05-16 | 1 | -3/+0 |
* | | | | | | Update state_machines-activerecord from 0.3.0 to 0.4.0. | Connor Shea | 2016-05-25 | 1 | -1/+1 |
* | | | | | | Add rubocop-rspecrs-rubocop-rspec | Robert Speicher | 2016-05-23 | 1 | -0/+1 |
* | | | | | | Update rubocop to 0.40.0 | Robert Speicher | 2016-05-23 | 1 | -2/+2 |
* | | | | | | Upgrade activerecord-sessionstore from 0.1.2 to 1.0.0. | Connor Shea | 2016-05-19 | 1 | -1/+1 |
* | | | | | | Merge remote-tracking branch 'origin/master' into docker-registry | Kamil Trzcinski | 2016-05-13 | 1 | -4/+4 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'remove-deprecated-finders' into 'master' | Douwe Maan | 2016-05-13 | 1 | -1/+0 |
| |\ \ \ \ \ | |||||
| | * | | | | | Remove activerecord-deprecated_finders gem | Connor Shea | 2016-05-10 | 1 | -1/+0 |
| * | | | | | | Merge branch 'health-check-route' | Douwe Maan | 2016-05-12 | 1 | -0/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Add the health_check gem end expose the health_check route | DJ Mountney | 2016-05-10 | 1 | -0/+3 |
| * | | | | | | | Removes jquery-scrollto-rails. | Connor Shea | 2016-05-10 | 1 | -1/+0 |
| | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Update Ace Editor | Alfredo Sumaran | 2016-05-10 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | | | | | Remove the annotate gem and delete old annotations | Jeroen van Baarsen | 2016-05-09 | 1 | -1/+0 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge remote-tracking branch 'origin/master' into docker-registry | Kamil Trzcinski | 2016-05-09 | 1 | -3/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'stanhu/gitlab-ce-bump-mailroom' | Douwe Maan | 2016-05-05 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Bump mail_room to 0.7.0 to fix stuck IDLE connections | Stan Hu | 2016-04-30 | 1 | -1/+1 |
| | | |_|/ | | |/| | |