Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | Merge branch 'no-highlight-files' into 'master' | Sytse Sijbrandij | 2015-02-18 | 1 | -1/+1 | |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "NEWS" to no_highlight_files "NEWS" is used in gnu style opensource projects for the changelog. So let's add it to `no_highlight_files`. See merge request !249 | |||||
| | | * | Added "news" to no_highlight_files | Stefan Tatschner | 2014-12-03 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'performance-improvements' into 'master' | Dmitriy Zaporozhets | 2015-02-18 | 1 | -1/+7 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance improvements * More efficient DB queries * Cache ApplicationSettings per request * Dont query for objects you dont need See merge request !1540 | |||||
| | * | | | DB performance improvements to GitLab | Dmitriy Zaporozhets | 2015-02-18 | 1 | -1/+7 | |
| | |/ / | ||||||
| * | | | Fix Markdown relative links to files with anchors. | Douwe Maan | 2015-02-18 | 1 | -4/+5 | |
| |/ / | ||||||
| * | | Add link to share via twitter to "created project" event. | Douwe Maan | 2015-02-13 | 1 | -0/+4 | |
| | | | ||||||
| * | | Refactor event title generation for more consistent messages. | Douwe Maan | 2015-02-13 | 1 | -21/+32 | |
| | | | | | | | | | | | | Example: "User joined project Namespace / Project" rather than "User joined project at Namespace / Project" | |||||
* | | | Upgrade to Rails 4.1.9 | Vinnie Okada | 2015-02-14 | 14 | -62/+156 | |
|/ / | | | | | | | | | | | Make the following changes to deal with new behavior in Rails 4.1.2: * Use nested resources to avoid slashes in arguments to path helpers. | |||||
* | | Merge branch 'master' into 'master' | Dmitriy Zaporozhets | 2015-02-12 | 1 | -3/+16 | |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds new label color suggestions This adds a bunch of label color suggestions   See merge request !289 | |||||
| * | | Reorders label colors for better "rainbow" | phortx | 2015-01-13 | 1 | -8/+8 | |
| | | | ||||||
| * | | Add more label color suggestions | phortx | 2015-01-13 | 1 | -1/+14 | |
| | | | ||||||
* | | | Add labels notes | Nikita Verkhovin | 2015-02-08 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'api-default-order' into 'master' | Dmitriy Zaporozhets | 2015-02-06 | 1 | -0/+79 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sorting refactoring * refactor sorting logic for web UI * refactor and document ordering for API: project, issues, merge requests * explicitly define ordering in models using default_scope See merge request !1476 | |||||
| * | | | Refactor sorting in project | Dmitriy Zaporozhets | 2015-02-05 | 1 | -0/+79 | |
| | | | | ||||||
* | | | | GitLab integration. Importer | Valery Sizov | 2015-02-05 | 2 | -2/+6 | |
|/ / / | ||||||
* | | | Improve collapsing sidebar | Dmitriy Zaporozhets | 2015-02-03 | 1 | -0/+8 | |
| | | | ||||||
* | | | Merge branch 'collapseable-nav' of ↵ | Dmitriy Zaporozhets | 2015-02-03 | 1 | -0/+5 | |
|\ \ \ | | | | | | | | | | | | | https://github.com/jasonblanchard/gitlabhq into jasonblanchard-collapseable-nav | |||||
| * | | | Adds persistent collapse button for left side bar | Jason Blanchard | 2015-02-03 | 1 | -0/+5 | |
| | | | | ||||||
* | | | | Rubocop: indentation fixes Yay!!! | Dmitriy Zaporozhets | 2015-02-02 | 2 | -2/+2 | |
| | | | | ||||||
* | | | | Rubocop: no trailing newlines | Dmitriy Zaporozhets | 2015-02-02 | 1 | -1/+0 | |
| | | | | ||||||
* | | | | Rubocop: Style/ElseAlignment enabled | Dmitriy Zaporozhets | 2015-02-02 | 1 | -6/+7 | |
| | | | | ||||||
* | | | | Rubocop: comment indentation | Dmitriy Zaporozhets | 2015-02-02 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Rubocop: Style/AlignHash enabled | Dmitriy Zaporozhets | 2015-02-02 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Rubocop enabled for: Use spaces inside hash literal braces | Dmitriy Zaporozhets | 2015-02-02 | 2 | -3/+3 | |
| | | | | ||||||
* | | | | Fix syntax error | Dmitriy Zaporozhets | 2015-02-02 | 1 | -5/+7 | |
| | | | | ||||||
* | | | | Convert hashes to ruby 1.9 style | Dmitriy Zaporozhets | 2015-02-02 | 2 | -2/+2 | |
|/ / / | ||||||
* | | | Merge pull request #8670 from tsigo/rs-fa-icon-helper | Dmitriy Zaporozhets | 2015-01-29 | 9 | -41/+42 | |
|\ \ \ | | | | | | | | | Add icon helper method | |||||
| * | | | Use `icon` helper method in helper modules | Robert Speicher | 2015-01-28 | 7 | -27/+19 | |
| | | | | ||||||
| * | | | Move `spinner` helper into IconsHelper | Robert Speicher | 2015-01-28 | 2 | -9/+9 | |
| | | | | | | | | | | | | | | | | Also updates it to use the new `icon` method. | |||||
| * | | | Add `icon` helper method | Robert Speicher | 2015-01-28 | 1 | -5/+14 | |
| | | | | ||||||
* | | | | Build the urls inside of the service. | Marin Jankovski | 2015-01-28 | 1 | -16/+3 | |
|/ / / | ||||||
* | | | Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master' | Dmitriy Zaporozhets | 2015-01-27 | 2 | -32/+8 | |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | Move external issue tracker away from yml config See merge request !1442 | |||||
| * \ \ | Merge branch 'master' into move_external_issue_tracker_away_from_yml_config | Marin Jankovski | 2015-01-26 | 4 | -55/+91 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/project.rb spec/models/project_spec.rb | |||||
| * | | | | Update the issue tracker attribute on issue tracker change. | Marin Jankovski | 2015-01-26 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into move_external_issue_tracker_away_from_yml_config | Marin Jankovski | 2015-01-23 | 8 | -24/+53 | |
| |\ \ \ \ | ||||||
| * | | | | | Remove configuration option from project settings page for external issue ↵ | Marin Jankovski | 2015-01-23 | 1 | -12/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | trackers. | |||||
| * | | | | | Manipulate external tracker issues urls generated from services. | Marin Jankovski | 2015-01-23 | 1 | -11/+4 | |
| | | | | | | ||||||
| * | | | | | Do a check which issue tracker is used inside the project. | Marin Jankovski | 2015-01-23 | 1 | -4/+4 | |
| | | | | | | ||||||
| * | | | | | Use service settings instead of config file settings to present issues. | Marin Jankovski | 2015-01-23 | 1 | -8/+3 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'github-no-omniauth' into 'master' | Valery Sizov | 2015-01-27 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't require omniauth to enable github importer I noticed the github importer is only enabled when omniauth authentication is also enabled. That isn't actually necessary -- just the oauth keys from GitHub are required to be configured. The fix for this is very simple. See merge request !316 | |||||
| * | | | | | | Don't require omniauth to be enabled, to use github importer | Marco Wessel | 2015-01-26 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Fix app title when browse blob | Dmitriy Zaporozhets | 2015-01-26 | 1 | -0/+2 | |
| |_|_|/ / / |/| | | | | | ||||||
* | | | | | | Refactor blob helpers | Dmitriy Zaporozhets | 2015-01-26 | 3 | -39/+43 | |
|/ / / / / | ||||||
* | | | | | Remove default project icon | Dmitriy Zaporozhets | 2015-01-24 | 1 | -2/+0 | |
| | | | | | ||||||
* | | | | | Predefine colors for project identicons | Dmitriy Zaporozhets | 2015-01-24 | 1 | -4/+13 | |
| | | | | | ||||||
* | | | | | Fix tests, merge conflicts, some minor issues and make the project avatar ↵ | Hannes Rosenögger | 2015-01-24 | 1 | -18/+18 | |
| | | | | | | | | | | | | | | | | | | | | feature mergable | |||||
* | | | | | adding avatar to project settings page added avatar removal show project ↵ | Steven Thonus | 2015-01-24 | 1 | -0/+25 | |
| |/ / / |/| | | | | | | | | | | | avatar on dashboard, projects page, project page added rspec and feature tests added project avatar from repository new default project icon added added copying af avatar to forking of project added generated icon fixed avatar fork hound fix style fix test fix | |||||
* | | | | Show branches/tags as labels on commit page | Dmitriy Zaporozhets | 2015-01-22 | 1 | -2/+16 | |
| | | | | ||||||
* | | | | Merge pull request #7999 from cirosantilli/append-inplace | Dmitriy Zaporozhets | 2015-01-21 | 5 | -8/+11 | |
|\ \ \ \ | | | | | | | | | | | Append in place for strings and arrays [failure unrelated] | |||||
| * | | | | Append in place for strings and arrays | Ciro Santilli | 2015-01-01 | 5 | -8/+11 | |
| | | | | |