summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-04-1922-70/+223
|\ | | | | | | | | Conflicts: db/schema.rb
| * Use constants in Gitlab::MarkupHelperDouwe Maan2017-04-201-9/+16
| |
| * Refactor changing files in web UIDouwe Maan2017-04-206-39/+42
| |
| * Merge branch 'query-users-by-extern-uid' into 'master'Robert Speicher2017-04-191-8/+14
| |\ | | | | | | | | | | | | Implement search by extern_uid in Users API See merge request !10509
| | * Implement search by extern_uid in Users APIRobin Bobbitt2017-04-181-8/+14
| | |
| * | Merge branch 'issuable-state-only-notes-and-description' into 'master' Sean McGivern2017-04-191-0/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Display issuable state only in notes and issuable description Closes #30964 See merge request !10789
| | * | Display issuable state only in notes and issuable descriptionAdam Niedzielski2017-04-191-0/+2
| | | | | | | | | | | | | | | | Closes #30964
| * | | Merge branch 'usage-ping-port' into 'master' Sean McGivern2017-04-197-1/+130
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Usage ping port Closes #27750 See merge request !10481
| | * | | Remove unused user activities codeSean McGivern2017-04-144-78/+1
| | | | |
| | * | | Expose `last_activity_on` in the User APIRémy Coutable2017-04-142-9/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | Add a new Gitlab::UserActivities class to track user activitiesRémy Coutable2017-04-143-83/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new class uses a Redis Hash instead of a Sorted Set. Signed-off-by: Rémy Coutable <remy@rymai.me>
| | * | | Port 'Add user activities API' to CESean McGivern2017-04-146-1/+172
| | | | | | | | | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/962
| | * | | Remove user activities table and use redis instead of PG for recording ↵James Lopez2017-04-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | activities Refactored specs and added a post deployment migration to remove the activity users table.
| | * | | Add user activity service and spec. Also added relevant - NOT offline - ↵James Lopez2017-04-141-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | migration It uses a user activity table instead of a column in users. Tested with mySQL and postgreSQL
| | * | | Add prometheus services to usage pingSean McGivern2017-04-141-0/+1
| | | | |
| | * | | Add edition to usage pingSean McGivern2017-04-141-5/+8
| | | | |
| | * | | Add Upload count to usage dataRobert Speicher2017-04-141-0/+1
| | | | |
| | * | | Used named parameter for refreshing usage dataStan Hu2017-04-141-4/+4
| | | | |
| | * | | Cache the last usage data to avoid unicorn timeoutsStan Hu2017-04-141-4/+4
| | | | |
| | * | | Port 'Add uuid to usage ping' to CESean McGivern2017-04-141-1/+4
| | | | | | | | | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1521
| | * | | Track Mattermost usageZ.J. van de Weg2017-04-141-1/+2
| | | | |
| | * | | Remove pushes count from usage ping payloadRuben Davila2017-04-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This query is constantly generating timeout errors on large installations and we don't have a simple solution for now and also we don't think having this counter is really critical.
| | * | | Port 'Add more usage data to EE ping' to CESean McGivern2017-04-141-0/+57
| | | | | | | | | | | | | | | | | | | | CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/735
| * | | | Fix duplicated container repository namesGrzegorz Bizon2017-04-181-2/+8
| | |/ / | |/| |
| * | | Merge branch 'fix/improve-gitaly-unsupported-address-error' into 'master' Robert Speicher2017-04-181-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve gitaly_address error message Closes gitaly#174 See merge request !10532
| | * | | Improve gitaly_address error messagefix/improve-gitaly-unsupported-address-errorAhmad Sherif2017-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | Closes gitaly#174
| * | | | Improves support for long build traces:Filipa Lacerda2017-04-181-1/+1
| | | | |
| * | | | Use &. because rubocop. Seriously I don't think this makes senseLin Jen-Shin2017-04-181-1/+1
| | | | |
| * | | | Just enforce the output encoding for Ansi2htmlLin Jen-Shin2017-04-182-11/+4
| | | | | | | | | | | | | | | | | | | | Fixes https://sentry.gitlap.com/gitlab/gitlabcom/issues/27545/
| * | | | Merge branch 'dm-git-blob-sizes' into 'master' Robert Speicher2017-04-181-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Normalize sizes in Gitlab::Git::Blob See merge request !10742
| | * | | | Normalize sizes in Gitlab::Git::BlobDouwe Maan2017-04-171-2/+2
| | | | | |
| * | | | | Does not remove the GitHub remote when importing from GitHubDouglas Barbosa Alexandre2017-04-181-1/+0
| |/ / / /
| * | | | Set the encoding in c'tor and explain why it's finefix-trace-encodingLin Jen-Shin2017-04-171-8/+8
| | | | |
| * | | | Only set the encoding before passing to Ansi2htmlLin Jen-Shin2017-04-172-5/+8
| | | | |
| * | | | Don't try to read if there's no traceLin Jen-Shin2017-04-171-0/+2
| | | | |
| * | | | Make sure @stream.each_line would tag Encoding.default_externalLin Jen-Shin2017-04-171-0/+2
| | | | |
| * | | | Make sure we're giving Encoding.default_externalLin Jen-Shin2017-04-171-2/+2
| | | | |
| * | | | Fix regression in rendering Markdown references that do not existsh-fix-base-parserStan Hu2017-04-151-1/+2
| | |/ / | |/| | | | | | | | | | Closes #30972
* | | | Fix Rubocop complains plus some small refactorRuben Davila2017-04-191-5/+5
| | | |
* | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-pagePhil Hughes2017-04-148-43/+30
|\ \ \ \ | |/ / /
| * | | Merge branch '30349-create-users-build-service' into 'master' Rémy Coutable2017-04-141-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement Users::BuildService Closes #30349 See merge request !10675
| | * | | Implement Users::BuildServicegeoandri2017-04-131-1/+1
| | | | |
| * | | | Merge branch 'branch-versions' into 'master' Rémy Coutable2017-04-144-34/+22
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expand components version specification format to allow branches Closes gitaly#183 See merge request !10610
| | * | | | Expand components version specification format to allow branchesbranch-versionsAlejandro Rodríguez2017-04-134-34/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we specify versions for Gitlab-Shell, Workhorse and Gitaly using version strings, to which we prepend 'v' and assume are tags. These changes allow branches or tags with other name formats to be specified by prepending '=' to the version string (á la govendor). We also simplify the process to reset to the given version (now a branch or tag): Right now there's a check to supposedly try to avoid fetching from the remote the version if it already exist locally. But the previous logic already clones if the directory doesn't exist or fetches if it does, so this check is pointless. We can safely assume the version exists once we get to the reset stage.
| * | | | | Merge branch 'fix-appending-state-to-issuable-references' into 'master' Robert Speicher2017-04-131-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix appending state to issuable references Closes #30874 See merge request !10683
| | * | | | | Fix appending state to issuable referencesfix-appending-state-to-issuable-referencesAdam Niedzielski2017-04-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #30874. Ignore nodes with no children. Append directly to the node instead of the last child of the node to avoid inheriting formatting from the last child
| * | | | | | Merge branch 'fix-trace-seeking-readline' into 'master' Kamil Trzciński2017-04-131-4/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After Trace#limit, we seek to the next line in case Closes #30796 See merge request !10681
| | * | | | | | Don't seek at all if the log is small anywayLin Jen-Shin2017-04-131-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | then it's fine to skip the first line because it won't be very noticeable
| | * | | | | | After Trace#limit, we seek to the next line in caseLin Jen-Shin2017-04-131-0/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | of breaking ANSI sequence or Unicode
| * | | | | | Sanitize container repository path in model classfix/gb/fix-registry-for-uppercased-project-pathsGrzegorz Bizon2017-04-131-2/+2
| | | | | | |
View Lorry Controller Status