summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Merge branch 'no-highlight-files' into 'master'Sytse Sijbrandij2015-02-181-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_filesStefan Tatschner2014-12-031-1/+1
| | | |
| * | | Merge branch 'performance-improvements' into 'master'Dmitriy Zaporozhets2015-02-181-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 GitLabDmitriy Zaporozhets2015-02-181-1/+7
| | |/ /
| * | | Fix Markdown relative links to files with anchors.Douwe Maan2015-02-181-4/+5
| |/ /
| * | Add link to share via twitter to "created project" event.Douwe Maan2015-02-131-0/+4
| | |
| * | Refactor event title generation for more consistent messages.Douwe Maan2015-02-131-21/+32
| | | | | | | | | | | | Example: "User joined project Namespace / Project" rather than "User joined project at Namespace / Project"
* | | Upgrade to Rails 4.1.9Vinnie Okada2015-02-1414-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 Zaporozhets2015-02-121-3/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds new label color suggestions This adds a bunch of label color suggestions ![labels2](https://gitlab.com/uploads/gitlab-org/gitlab-ce/ac1a207575/labels2.png) ![labels1](https://gitlab.com/uploads/benny/gitlab-ce/d47fbecc16/labels1.png) See merge request !289
| * | Reorders label colors for better "rainbow"phortx2015-01-131-8/+8
| | |
| * | Add more label color suggestionsphortx2015-01-131-1/+14
| | |
* | | Add labels notesNikita Verkhovin2015-02-081-1/+1
| | |
* | | Merge branch 'api-default-order' into 'master'Dmitriy Zaporozhets2015-02-061-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 projectDmitriy Zaporozhets2015-02-051-0/+79
| | | |
* | | | GitLab integration. ImporterValery Sizov2015-02-052-2/+6
|/ / /
* | | Improve collapsing sidebarDmitriy Zaporozhets2015-02-031-0/+8
| | |
* | | Merge branch 'collapseable-nav' of ↵Dmitriy Zaporozhets2015-02-031-0/+5
|\ \ \ | | | | | | | | | | | | https://github.com/jasonblanchard/gitlabhq into jasonblanchard-collapseable-nav
| * | | Adds persistent collapse button for left side barJason Blanchard2015-02-031-0/+5
| | | |
* | | | Rubocop: indentation fixes Yay!!!Dmitriy Zaporozhets2015-02-022-2/+2
| | | |
* | | | Rubocop: no trailing newlinesDmitriy Zaporozhets2015-02-021-1/+0
| | | |
* | | | Rubocop: Style/ElseAlignment enabledDmitriy Zaporozhets2015-02-021-6/+7
| | | |
* | | | Rubocop: comment indentationDmitriy Zaporozhets2015-02-021-1/+1
| | | |
* | | | Rubocop: Style/AlignHash enabledDmitriy Zaporozhets2015-02-021-2/+2
| | | |
* | | | Rubocop enabled for: Use spaces inside hash literal bracesDmitriy Zaporozhets2015-02-022-3/+3
| | | |
* | | | Fix syntax errorDmitriy Zaporozhets2015-02-021-5/+7
| | | |
* | | | Convert hashes to ruby 1.9 styleDmitriy Zaporozhets2015-02-022-2/+2
|/ / /
* | | Merge pull request #8670 from tsigo/rs-fa-icon-helperDmitriy Zaporozhets2015-01-299-41/+42
|\ \ \ | | | | | | | | Add icon helper method
| * | | Use `icon` helper method in helper modulesRobert Speicher2015-01-287-27/+19
| | | |
| * | | Move `spinner` helper into IconsHelperRobert Speicher2015-01-282-9/+9
| | | | | | | | | | | | | | | | Also updates it to use the new `icon` method.
| * | | Add `icon` helper methodRobert Speicher2015-01-281-5/+14
| | | |
* | | | Build the urls inside of the service.Marin Jankovski2015-01-281-16/+3
|/ / /
* | | Merge branch 'move_external_issue_tracker_away_from_yml_config' into 'master'Dmitriy Zaporozhets2015-01-272-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_configMarin Jankovski2015-01-264-55/+91
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/models/project.rb spec/models/project_spec.rb
| * | | | Update the issue tracker attribute on issue tracker change.Marin Jankovski2015-01-261-3/+3
| | | | |
| * | | | Merge branch 'master' into move_external_issue_tracker_away_from_yml_configMarin Jankovski2015-01-238-24/+53
| |\ \ \ \
| * | | | | Remove configuration option from project settings page for external issue ↵Marin Jankovski2015-01-231-12/+0
| | | | | | | | | | | | | | | | | | | | | | | | trackers.
| * | | | | Manipulate external tracker issues urls generated from services.Marin Jankovski2015-01-231-11/+4
| | | | | |
| * | | | | Do a check which issue tracker is used inside the project.Marin Jankovski2015-01-231-4/+4
| | | | | |
| * | | | | Use service settings instead of config file settings to present issues.Marin Jankovski2015-01-231-8/+3
| | | | | |
* | | | | | Merge branch 'github-no-omniauth' into 'master'Valery Sizov2015-01-271-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 importerMarco Wessel2015-01-261-1/+1
| | | | | | |
* | | | | | | Fix app title when browse blobDmitriy Zaporozhets2015-01-261-0/+2
| |_|_|/ / / |/| | | | |
* | | | | | Refactor blob helpersDmitriy Zaporozhets2015-01-263-39/+43
|/ / / / /
* | | | | Remove default project iconDmitriy Zaporozhets2015-01-241-2/+0
| | | | |
* | | | | Predefine colors for project identiconsDmitriy Zaporozhets2015-01-241-4/+13
| | | | |
* | | | | Fix tests, merge conflicts, some minor issues and make the project avatar ↵Hannes Rosenögger2015-01-241-18/+18
| | | | | | | | | | | | | | | | | | | | feature mergable
* | | | | adding avatar to project settings page added avatar removal show project ↵Steven Thonus2015-01-241-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 pageDmitriy Zaporozhets2015-01-221-2/+16
| | | |
* | | | Merge pull request #7999 from cirosantilli/append-inplaceDmitriy Zaporozhets2015-01-215-8/+11
|\ \ \ \ | | | | | | | | | | Append in place for strings and arrays [failure unrelated]
| * | | | Append in place for strings and arraysCiro Santilli2015-01-015-8/+11
| | | | |