summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* monkey patch for mysql 5.7monkey_patchValery Sizov2016-01-251-0/+48
|
* Instrument Gitlab::Git::RepositoryYorick Peterse2016-01-211-0/+1
| | | | | This adds instrumentation for the instance methods of Gitlab::Git::Repository.
* Implement new UI for paginationDmitriy Zaporozhets2016-01-201-0/+4
|
* Use sentry in env production onlyJeroen Nijhof2016-01-201-9/+11
|
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jeroen Nijhof2016-01-202-8/+17
|\ | | | | | | | | | | | | sentry-integration Conflicts: db/schema.rb
| * Raise an error on page load if there are pending migrations on dev envDouglas Barbosa Alexandre2016-01-191-0/+3
| |
| * Ensure Gravatar host looks like an actual hostfix-gravator-default-urlRémy Coutable2016-01-181-8/+14
| |
* | Add sentry integrationJeroen Nijhof2016-01-181-0/+17
|/
* Added metrics instrumentation for all findersinstrument-findersYorick Peterse2016-01-181-0/+6
|
* Merge branch 'no-mail-during-dev-bootstrap' into 'master' Jacob Vosmaer2016-01-151-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't send (fake) email during dev bootstrap This allows you to do: rake dev:setup BOOTSTRAP=1 and prevent dozens of letter_opener email popups in your browser. In the latest GDK we automatically set BOOTSTRAP=1 during `make`. [ci skip] See merge request !2447
| * Don't send (fake) email during dev bootstrapno-mail-during-dev-bootstrapJacob Vosmaer2016-01-151-0/+2
| | | | | | | | | | | | | | | | This allows you to do: rake dev:setup BOOTSTRAP=1 and prevent dozens of letter_opener emai popups in your browser.
* | Merge branch 'import-gh-wiki' into 'master' Douwe Maan2016-01-141-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import GitHub wiki into GitLab Closes #2834 GitHub doesn’t apply any constraints to theirs wiki slug allowing chars like ,, :, *, etc, we need to remove our constraints or some wiki pages will not be available after they are imported. Some wikis use the Gollum's tags to link its internal/external resources like: images, urls, wiki pages, etc. So, to avoid that wiki links/images displays completely broken after they were imported, we added a new `WikiPipeline`, that for now will parse only simple links, and image tags. ##### Before `WikiPipeline`: ![Screenshot_2016-01-11_20.14.48](/uploads/46fd5dbb5acfc70aa8ecca3050b675e4/Screenshot_2016-01-11_20.14.48.png) ##### After `WikiPipeline`: ![Screenshot_2016-01-11_20.15.56](/uploads/b1d94aa852f385f867a7868c358b4257/Screenshot_2016-01-11_20.15.56.png) See merge request !2324
| * | Remove unnecessary brackets on WIKI_SLUG_ID route constraintsDouglas Barbosa Alexandre2016-01-141-1/+1
| | |
| * | Relax constraints for wiki slugDouglas Barbosa Alexandre2016-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since GitHub doesn’t apply these constraints to theirs wiki slug allowing characters like `,`, `:`, `*`, etc, we need to relax our constraints or some wiki pages will not be available after they were imported. For an example the Devise project have a wiki page with the following slug: “How To: Add sign_in, sign_out, and sign_up links to your layout template”
* | | Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master' Douwe Maan2016-01-141-0/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Unsubscribe from thread through link in email footer Closes #3437 ![Screenshot_from_2015-12-11_15-35-06](/uploads/cfb3d8737d4757f527995411f103d0ce/Screenshot_from_2015-12-11_15-35-06.png) ![Screenshot_from_2015-12-11_15-35-56](/uploads/9b7121be7ce4b05e5995ca6d38c5bea4/Screenshot_from_2015-12-11_15-35-56.png) See merge request !2068
| * | Minor improvements, unsubscribe from email footerZeger-Jan van de Weg2016-01-091-1/+1
| | |
| * | Unsubscribe from thread through link in email footerZeger-Jan van de Weg2016-01-091-0/+6
| | |
* | | Minor improvements in build arfifacts browserci/view-build-artifactsGrzegorz Bizon2016-01-141-2/+2
| | | | | | | | | | | | | | | Added also a `Gitlab::Ci::Build::Artifacts::Metadata::ParserError` exception class.
* | | Improve readability of artifacts `Metadata` related codeGrzegorz Bizon2016-01-141-3/+2
| | |
* | | Simplify implementation of build artifacts browser (refactoring)Grzegorz Bizon2016-01-141-0/+1
| | |
* | | Disable `:format` in artifacts browser pathGrzegorz Bizon2016-01-141-1/+1
| | |
* | | Move artifacts controller level upGrzegorz Bizon2016-01-141-7/+3
| | | | | | | | | | | | This reverts nesting artifacts controller in builds module.
* | | Add view action to artifacts controllerGrzegorz Bizon2016-01-141-1/+2
| | |
* | | Move build artifacts implementation to separate controllerGrzegorz Bizon2016-01-141-1/+9
| | |
* | | Broadcast Messages can now be editedRobert Speicher2016-01-131-1/+1
| | | | | | | | | | | | Closes #3046
* | | Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master' Douwe Maan2016-01-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #9963 reference_filter "Encoding::CompatibilityError" bug with some complex URL; https://github.com/gitlabhq/gitlabhq/pull/9964 @DouweM See merge request !2383
| * | | Use CGI.escape instead of URI.escape, because URI is obsoleted.Jason Lee2016-01-121-1/+1
| | |/ | |/| | | | | | | ref: https://github.com/ruby/ruby/commit/238b979f1789f95262a267d8df6239806f2859cc
* | | Revert "Remove the `:coffee` and `:coffeescript` Haml filters"Robert Speicher2016-01-121-6/+0
|/ / | | | | | | This reverts commit ae7de2f8510d6d4b69120f168122e26d69dda256.
* | Remove the `:coffee` and `:coffeescript` Haml filtersrs-remove-coffee-filtersRobert Speicher2016-01-111-0/+6
| | | | | | | | See https://git.io/vztMu and http://stackoverflow.com/a/17571242/223897
* | Optimize LDAP and add a search timeoutDrew Blessing2016-01-112-0/+6
| |
* | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-081-3/+3
|\ \ | |/
| * Merge branch 'issue_3076' into 'master' Drew Blessing2016-01-081-3/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Fix problem with projects ending with .keys #3076 Closes #3076 Move route `:username.keys` below project's routes. This allow project's to handle names ending with `.keys` See merge request !1883
| | * Fix problem with projects ending with .keys #3076Jose Corcuera2016-01-061-3/+3
| | |
* | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-081-0/+9
|\ \ \ | |/ /
| * | Add two custom Date/Time conversion formatsRobert Speicher2016-01-071-0/+9
| | |
* | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-071-0/+18
|\ \ \ | |/ /
| * | Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-071-0/+18
| |/
* | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-0631-191/+388
|\ \ | |/
| * Track total query/view timings in transactionsYorick Peterse2016-01-041-0/+1
| |
| * Removed tracking of hostnames for metricsYorick Peterse2015-12-311-1/+0
| | | | | | | | | | This isn't hugely useful and mostly wastes InfluxDB space. We can re-add this whenever needed (but only once we really need it).
| * Removed tracking of raw SQL queriesYorick Peterse2015-12-311-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | This particular setup had 3 problems: 1. Storing SQL queries as tags is very inefficient as InfluxDB ends up indexing every query (and they can get pretty large). Storing these as values instead means we can't always display the SQL as easily. 2. We already instrument ActiveRecord query methods, thus we already have timing information about database queries. 3. SQL obfuscation is difficult to get right and I'd rather not expose sensitive data by accident.
| * Merge branch 'remove-whenever-schedule' into 'master' Robert Speicher2015-12-301-8/+0
| |\ | | | | | | | | | | | | | | | | | | Remove unused config/schedule.rb file [ci skip] See merge request !2249
| | * We don't use whenever anymore. Lets remove the schedule fileJeroen van Baarsen2015-12-301-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | **Why is this needed?** Not really needed, but having code that is not used around is confusing, so lets remove it Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
| * | Added additional config environmental variables to help Debian packagingGabriel Mazetto2015-12-301-3/+3
| |/ | | | | | | | | * GITLAB_EMAIL_FROM * GITLAB_EMAIL_DISPLAY_NAME * GITLAB_EMAIL_REPLY_TO
| * reCAPTCHA is configurable through Admin Settings, no reload needed.Gabriel Mazetto2015-12-283-18/+0
| |
| * Merge branch 'relocate-influxdb-settings' into 'master' Yorick Peterse2015-12-282-24/+10
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Move InfluxDB settings to ApplicationSetting This moves the settings from the YAML files to the database. cc @sytses See merge request !2228
| | * Move InfluxDB settings to ApplicationSettingrelocate-influxdb-settingsYorick Peterse2015-12-282-24/+10
| | |
| * | Fixed syntax in gitlab.yml.exampleYorick Peterse2015-12-281-1/+1
| | |
| * | Merge branch 'restart-settings-are-moved-too' into 'master' Dmitriy Zaporozhets2015-12-281-2/+2
| |\ \ | | |/ | |/| | | | | | | | | | | | | Restart settings are moved too. See merge request !2226
| | * Restart settings are moved too.Sytse Sijbrandij2015-12-281-2/+2
| | |